Title: git_merge needs to reload the index · Issue #4203 · libgit2/libgit2 · GitHub
Open Graph Title: git_merge needs to reload the index · Issue #4203 · libgit2/libgit2
X Title: git_merge needs to reload the index · Issue #4203 · libgit2/libgit2
Description: Reproduction steps Do something that makes libgit2 load the index Do something to the index from the command line (like commit) so that the index & worktree are clean Call git_merge() Expected behavior Merge proceeds, recognizing the cle...
Open Graph Description: Reproduction steps Do something that makes libgit2 load the index Do something to the index from the command line (like commit) so that the index & worktree are clean Call git_merge() Expected beha...
X Description: Reproduction steps Do something that makes libgit2 load the index Do something to the index from the command line (like commit) so that the index & worktree are clean Call git_merge() Expected ...
Opengraph URL: https://github.com/libgit2/libgit2/issues/4203
X: @github
Domain: github.com
{"@context":"https://schema.org","@type":"DiscussionForumPosting","headline":"git_merge needs to reload the index","articleBody":"### Reproduction steps\r\n* Do something that makes libgit2 load the index\r\n* Do something to the index from the command line (like commit) so that the index \u0026 worktree are clean\r\n* Call `git_merge()`\r\n\r\n### Expected behavior\r\nMerge proceeds, recognizing the clean state\r\n\r\n### Actual behavior\r\nUsing a stale index, git_merge aborts with `GIT_ECONFLICT`\r\n\r\n### Workaround\r\nManually refreshing the index produces the expected behavior.\r\n\r\n### Version of libgit2 (release number or SHA1)\r\n0.25.1\r\n\r\n### Operating system(s) tested\r\nmacOS 10.12.3","author":{"url":"https://github.com/Uncommon","@type":"Person","name":"Uncommon"},"datePublished":"2017-04-12T23:06:56.000Z","interactionStatistic":{"@type":"InteractionCounter","interactionType":"https://schema.org/CommentAction","userInteractionCount":1},"url":"https://github.com/4203/libgit2/issues/4203"}| 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:800ca6c3-efa1-7134-7db2-8c7eccca440b |
| current-catalog-service-hash | 81bb79d38c15960b92d99bca9288a9108c7a47b18f2423d0f6438c5b7bcd2114 |
| request-id | EAE2:92DB2:3D487F:4F7B21:6A5EB2D5 |
| html-safe-nonce | a64fd936e73d0bb0ed134e29e10601719cf2f553961600e72e8fa429c3aa8254 |
| visitor-payload | eyJyZWZlcnJlciI6IiIsInJlcXVlc3RfaWQiOiJFQUUyOjkyREIyOjNENDg3Rjo0RjdCMjE6NkE1RUIyRDUiLCJ2aXNpdG9yX2lkIjoiMTI2ODY4NzcwNjk5NTQ3MTA2MSIsInJlZ2lvbl9lZGdlIjoiaWFkIiwicmVnaW9uX3JlbmRlciI6ImlhZCJ9 |
| visitor-hmac | 533692a93f000ade2dd315cc984b11e68ad0fd1d694f19e7ede338b62074a5cf |
| hovercard-subject-tag | issue:221414885 |
| 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/libgit2/libgit2/4203/issue_layout |
| twitter:image | https://opengraph.githubassets.com/c3239fe735c2fcc7cbf9c07658698152c6bf53de63843c9e7bbdc051f853a4b5/libgit2/libgit2/issues/4203 |
| twitter:card | summary_large_image |
| og:image | https://opengraph.githubassets.com/c3239fe735c2fcc7cbf9c07658698152c6bf53de63843c9e7bbdc051f853a4b5/libgit2/libgit2/issues/4203 |
| og:image:alt | Reproduction steps Do something that makes libgit2 load the index Do something to the index from the command line (like commit) so that the index & worktree are clean Call git_merge() Expected beha... |
| og:image:width | 1200 |
| og:image:height | 600 |
| og:site_name | GitHub |
| og:type | object |
| og:author:username | Uncommon |
| hostname | github.com |
| expected-hostname | github.com |
| None | 7129250e6854dcc7bfa46fc877bb154b96762b31e3fa82fdf0697c71f08bb32c |
| turbo-cache-control | no-preview |
| go-import | github.com/libgit2/libgit2 git https://github.com/libgit2/libgit2.git |
| octolytics-dimension-user_id | 394745 |
| octolytics-dimension-user_login | libgit2 |
| octolytics-dimension-repository_id | 901662 |
| octolytics-dimension-repository_nwo | libgit2/libgit2 |
| octolytics-dimension-repository_public | true |
| octolytics-dimension-repository_is_fork | false |
| octolytics-dimension-repository_network_root_id | 901662 |
| octolytics-dimension-repository_network_root_nwo | libgit2/libgit2 |
| 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 | 3084c198d559e243975a7a7f61d0b80bcea2a724 |
| ui-target | full |
| theme-color | #1e2327 |
| color-scheme | light dark |
Links:
Viewport: width=device-width