René's URL Explorer Experiment

{"@context":"https://schema.org","@type":"DiscussionForumPosting","headline":"Git.Merge.trees seems to be unusable","articleBody":"I am trying to follow [these instructions](https://github.com/libgit2/pygit2/blob/master/docs/recipes/git-cherry-pick.rst#cherry-picking-a-commit-without-a-working-copy) to perform a cherry-pick in a bare repository. This is what I ended up with:\r\n\r\n```typescript\r\nasync cherryPickWithMessage(localBranch: string, commit: string, message: string) {\r\n  const theirCommit = await this.repo.getCommit(commit);\r\n  const ourCommit = await this.repo.getBranchCommit(localBranch);\r\n  const base = await Git.Merge.base(this.repo, theirCommit.id(), ourCommit.id());\r\n\r\n  // nodegit has a bug that causes .parent() to return a \"partial\" commit that\r\n  // cannot be used for subsequent operations such as .getTree(). See\r\n  // https://github.com/nodegit/nodegit/pull/1110.\r\n  const baseTreeId = await theirCommit.parent(0).then(c =\u003e c.treeId());\r\n  const baseTree = await this.repo.getTree(baseTreeId);\r\n  const theirTree = await theirCommit.getTree();\r\n  const ourTree = await ourCommit.getTree();\r\n  // This does not work.\r\n  const index = await Git.Merge.trees(this.repo, baseTree, ourTree, theirTree, null);\r\n  const newTreeId = await index.writeTree();\r\n\r\n  const ownCommitterSignature = theirCommit.committer(); // TODO\r\n  return await this.repo.createCommit(localBranch, theirCommit.author(), ownCommitterSignature, message, newTreeId, [ourCommit]).then(id =\u003e id.tostrS());\r\n}\r\n```\r\n\r\nThe critical point is calling `Git.Merge.trees`. The [documentation](http://www.nodegit.org/api/merge/#trees) says that the fifth parameter is optional:\r\n\r\n\u003e the merge tree options (or null for defaults)\r\n\r\nHowever, when passing the options as described above, this error is thrown (which *might* be a bug):\r\n\r\n```\r\nError: MergeOptions opts is required.\r\n    at F:\\node-cq\\node_modules\\nodegit-promise\\lib\\node-extensions.js:24:20\r\n    at tryCallTwo (F:\\node-cq\\node_modules\\nodegit-promise\\lib\\core.js:45:5)\r\n    at doResolve (F:\\node-cq\\node_modules\\nodegit-promise\\lib\\core.js:173:13)\r\n    at new Promise (F:\\node-cq\\node_modules\\nodegit-promise\\lib\\core.js:65:3)\r\n    at Function.trees (F:\\node-cq\\node_modules\\nodegit-promise\\lib\\node-extensions.js:19:12)\r\n    at LG2Repository.\u003canonymous\u003e (F:\\node-cq\\lib\\local-git\\libgit2.ts:42:35)\r\n    at Generator.next (\u003canonymous\u003e)\r\n    at fulfilled (F:\\node-cq\\lib\\local-git\\libgit2.ts:4:58)\r\n    at \u003canonymous\u003e\r\n    at process._tickDomainCallback (internal/process/next_tick.js:228:7)\r\n```\r\n\r\nI tried passing an empty object `{}` as the `opts` parameter, which causes a CRT assertion (which - I assume - is definitely a bug):\r\n\r\n![clipboard01](https://user-images.githubusercontent.com/3109072/40919914-4982d146-680b-11e8-9554-62887c169e49.jpg)\r\n\r\nIs there a proper way to use this API without triggering an assertion or error?","author":{"url":"https://github.com/tniessen","@type":"Person","name":"tniessen"},"datePublished":"2018-06-04T13:26:33.000Z","interactionStatistic":{"@type":"InteractionCounter","interactionType":"https://schema.org/CommentAction","userInteractionCount":0},"url":"https://github.com/1504/nodegit/issues/1504"}