René's URL Explorer Experiment

{"@context":"https://schema.org","@type":"DiscussionForumPosting","headline":"`Repository.mergeBranches` creates dirty index after a non-conflicting merge","articleBody":"1. Run the code below.\r\n2. You will see that stuff gets printed indicating a dirty index.\r\n3. `cd merge-commit-bug`\r\n4. `git status`\r\n```\r\n\u003e git status\r\nOn branch master\r\nChanges to be committed:\r\n  (use \"git reset HEAD \u003cfile\u003e...\" to unstage)\r\n\r\n        modified:   test.txt\r\n```\r\n\r\nAll the tests in [`merge.js`](https://github.com/nodegit/nodegit/blob/4c8f601880a68d96ff59d18332e2d72524c05fe0/test/tests/merge.js) merges two random branches so the bug doesn't appear. The bug will only surfaces if you merge `HEAD` with another branch.\r\n\r\n```JavaScript\r\nvar path = require(\"path\");\r\nvar fs = require(\"fs\");\r\nvar git = require('.');\r\nvar repoDir = path.resolve(__dirname, \"merge-commit-bug\");\r\nvar name = \"test.txt\";\r\nvar name2 = \"test2.txt\";\r\nvar fileName = path.resolve(repoDir, name);\r\nvar fileName2 = path.resolve(repoDir, name2);\r\nvar repository;\r\nvar index;\r\nvar head;\r\nvar leftBranch;\r\n\r\nreturn git.Repository.init(repoDir, 0)\r\n.then(function(repo) {\r\n\trepository = repo;\r\n\tfs.writeFileSync(fileName, \"A\", null);\r\n\treturn repository.refreshIndex();\r\n})\r\n.then(function(idx) {\r\n\tindex = idx;\r\n\treturn index.addByPath(name);\r\n})\r\n.then(function() {\r\n\treturn index.writeTree();\r\n})\r\n.then(function(oid) {\r\n\treturn repository.createCommit(\"HEAD\",\r\n\t\tgit.Signature.default(repository),\r\n\t\tgit.Signature.default(repository),\r\n\t\t\"message\", oid, []);\r\n})\r\n.then(function(oid) {\r\n\thead = oid;\r\n\tfs.writeFileSync(fileName, \"B\", null);\r\n\treturn repository.refreshIndex();\r\n})\r\n.then(function(idx) {\r\n\tindex = idx;\r\n\treturn index.addByPath(name);\r\n})\r\n.then(function() {\r\n\treturn index.write();\r\n})\r\n.then(function() {\r\n\treturn index.writeTree();\r\n})\r\n.then(function(oid) {\r\n\treturn repository.createCommit(\"HEAD\",\r\n\t\tgit.Signature.default(repository),\r\n\t\tgit.Signature.default(repository),\r\n\t\t\"left\", oid, [ head ]);\r\n})\r\n.then(function(left) {\r\n\treturn repository.getCommit(left);\r\n})\r\n.then(function(commit) {\r\n\treturn git.Branch.create(repository, \"leftBranch\", commit, false);\r\n})\r\n.then(function(branch) {\r\n\tleftBranch = branch;\r\n\treturn repository.getCommit(head);\r\n})\r\n.then(function(commit) {\r\n\treturn git.Reset.reset(repository, commit, git.Reset.TYPE.HARD, {});\r\n})\r\n.then(function() {\r\n\tfs.writeFileSync(fileName2, \"C\", null);\r\n\treturn repository.refreshIndex();\r\n})\r\n.then(function(idx) {\r\n\tindex = idx;\r\n\treturn index.addByPath(name2);\r\n})\r\n.then(function() {\r\n\treturn index.write();\r\n})\r\n.then(function() {\r\n\treturn index.writeTree();\r\n})\r\n.then(function(oid) {\r\n\treturn repository.createCommit(\"HEAD\",\r\n\t\tgit.Signature.default(repository),\r\n\t\tgit.Signature.default(repository),\r\n\t\t\"right\", oid, [ head ]);\r\n})\r\n.then(function(commit) {\r\n\treturn repository.mergeBranches(\"master\", leftBranch, git.Signature.default(repository), null, null);\r\n})\r\n.then(function() {\r\n\treturn repository.getStatus();\r\n})\r\n.then(function(statuses) {\r\n\tconsole.log(statuses);\r\n\tconsole.log(statuses[0].path());\r\n})\r\n.catch(function(err) {\r\n\tconsole.log(err);\r\n});\r\n```","author":{"url":"https://github.com/rcjsuen","@type":"Person","name":"rcjsuen"},"datePublished":"2017-02-08T10:50:18.000Z","interactionStatistic":{"@type":"InteractionCounter","interactionType":"https://schema.org/CommentAction","userInteractionCount":6},"url":"https://github.com/1217/nodegit/issues/1217"}