Title: ancestor_tree cannot be null in Merge.trees · Issue #1061 · nodegit/nodegit · GitHub
Open Graph Title: ancestor_tree cannot be null in Merge.trees · Issue #1061 · nodegit/nodegit
X Title: ancestor_tree cannot be null in Merge.trees · Issue #1061 · nodegit/nodegit
Description: In Merge.trees method: As described in the documentation of libgit2, ancestor_tree can be null: the common ancestor between the trees (or null if none). However, because this parameter is not set as optional in descriptor.json. Using .. ...
Open Graph Description: In Merge.trees method: As described in the documentation of libgit2, ancestor_tree can be null: the common ancestor between the trees (or null if none). However, because this parameter is not set a...
X Description: In Merge.trees method: As described in the documentation of libgit2, ancestor_tree can be null: the common ancestor between the trees (or null if none). However, because this parameter is not set a...
Opengraph URL: https://github.com/nodegit/nodegit/issues/1061
X: @github
Domain: github.com
{"@context":"https://schema.org","@type":"DiscussionForumPosting","headline":"ancestor_tree cannot be null in Merge.trees","articleBody":"In **Merge.trees** method:\nAs described in the documentation of libgit2, `ancestor_tree` can be `null`: _the common ancestor between the trees (or null if none)_. However, because this parameter is not set as optional in `descriptor.json`. \n\nUsing ..\n\n``` js\nNodeGit.Merge.trees(repo, null, our_tree, their_tree, normalizeOptions({}, Git.MergeOptions))\n```\n\ngive the following error: `Error: Tree ancestor_tree is required`.\n### Solving it\n\n``` diff\ndiff --git a/generate/input/descriptor.json b/generate/input/descriptor.json\nindex 677029f..46698be 100644\n--- a/generate/input/descriptor.json\n+++ b/generate/input/descriptor.json\n@@ -1270,6 +1270,13 @@\n }\n }\n },\n+ \"git_merge_trees\": {\n+ \"args\": {\n+ \"ancestor_tree\": {\n+ \"isOptional\": true\n+ }\n+ }\n+ },\n \"git_merge_file\": {\n \"ignore\": true\n },\n```\n\nI'll make a put request for it ! ;-)\n","author":{"url":"https://github.com/rmedaer","@type":"Person","name":"rmedaer"},"datePublished":"2016-06-28T09:45:16.000Z","interactionStatistic":{"@type":"InteractionCounter","interactionType":"https://schema.org/CommentAction","userInteractionCount":0},"url":"https://github.com/1061/nodegit/issues/1061"}
| route-pattern | /_view_fragments/issues/show/:user_id/:repository/:id/issue_layout(.:format) |
| route-controller | voltron_issues_fragments |
| route-action | issue_layout |
| fetch-nonce | v2:6854ed8e-0c06-2ac1-426c-ba713a2bc19e |
| current-catalog-service-hash | 81bb79d38c15960b92d99bca9288a9108c7a47b18f2423d0f6438c5b7bcd2114 |
| request-id | E8F0:257F3:3435603:45377DE:6A5D103B |
| html-safe-nonce | 0f7c52c81bcb83b75b8f4e041a2b4510e81503204ff9501026d66d7c9b385cf7 |
| visitor-payload | eyJyZWZlcnJlciI6IiIsInJlcXVlc3RfaWQiOiJFOEYwOjI1N0YzOjM0MzU2MDM6NDUzNzdERTo2QTVEMTAzQiIsInZpc2l0b3JfaWQiOiIzNDA3MTM4MDI1MTU5NTk0MDQzIiwicmVnaW9uX2VkZ2UiOiJpYWQiLCJyZWdpb25fcmVuZGVyIjoiaWFkIn0= |
| visitor-hmac | accb82c1c7c5ee8697ba47dada89ed77346b762feb8c65bb2e220c3da18db5a3 |
| hovercard-subject-tag | issue:162644764 |
| github-keyboard-shortcuts | repository,issues,copilot |
| google-site-verification | Apib7-x98H0j5cPqHWwSMm6dNU4GmODRoqxLiDzdx9I |
| octolytics-url | https://collector.github.com/github/collect |
| analytics-location | / |
| fb:app_id | 1401488693436528 |
| apple-itunes-app | app-id=1477376905, app-argument=https://github.com/_view_fragments/issues/show/nodegit/nodegit/1061/issue_layout |
| twitter:image | https://opengraph.githubassets.com/3b2d8b905ff90f2c6754e10ef8fc00018da7d63c3d2654c314c93e29b76bcd1c/nodegit/nodegit/issues/1061 |
| twitter:card | summary_large_image |
| og:image | https://opengraph.githubassets.com/3b2d8b905ff90f2c6754e10ef8fc00018da7d63c3d2654c314c93e29b76bcd1c/nodegit/nodegit/issues/1061 |
| og:image:alt | In Merge.trees method: As described in the documentation of libgit2, ancestor_tree can be null: the common ancestor between the trees (or null if none). However, because this parameter is not set a... |
| og:image:width | 1200 |
| og:image:height | 600 |
| og:site_name | GitHub |
| og:type | object |
| og:author:username | rmedaer |
| hostname | github.com |
| expected-hostname | github.com |
| None | 5290d7e14309ad1e76106a9c4237bd1041517e83ea182c8ab756752cb0c6940b |
| turbo-cache-control | no-preview |
| go-import | github.com/nodegit/nodegit git https://github.com/nodegit/nodegit.git |
| octolytics-dimension-user_id | 657068 |
| octolytics-dimension-user_login | nodegit |
| octolytics-dimension-repository_id | 1383170 |
| octolytics-dimension-repository_nwo | nodegit/nodegit |
| octolytics-dimension-repository_public | true |
| octolytics-dimension-repository_is_fork | false |
| octolytics-dimension-repository_network_root_id | 1383170 |
| octolytics-dimension-repository_network_root_nwo | nodegit/nodegit |
| turbo-body-classes | logged-out env-production page-responsive |
| disable-turbo | false |
| browser-stats-url | https://api.github.com/_private/browser/stats |
| browser-errors-url | https://api.github.com/_private/browser/errors |
| release | 9c975978430e9ad293956f2bbdaf153b1bd84a99 |
| ui-target | full |
| theme-color | #1e2327 |
| color-scheme | light dark |
Links:
Viewport: width=device-width