{"thread":{"id":"48301","subject":"Git fast-export with import marks file omits merge commits","startedAt":"2018-04-16T19:58:28Z","lastAt":"2018-04-16T19:58:28Z","messageCount":1,"participants":["Isaac Chou"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"344816","messageId":"1D42A4F860DBEF4C91D0E09C5CDE20097EC178E8@prvxmb04.microfocus.com","threadId":"48301","inReplyTo":null,"subject":"Git fast-export with import marks file omits merge commits","fromName":"Isaac Chou","fromEmail":"isaac.chou@microfocus.com","sentAt":"2018-04-16T19:58:22Z","receivedAt":"2018-04-16T19:58:28Z","isPatch":false,"sender":{"key":"isaac.chou@microfocus.com","avatar":null},"body":"Hello,\n\nI came across a change of behavior with Git version 2.15 and later where the fast-export command would omit the merge commits.  The same use case works correctly with Git version 2.14 and older.  Here is the detail of the use case:\n\n0> git --version\ngit version 2.16.2.windows.1\n\n1> git init\nInitialized empty Git repository in c:/./.git/\n\n2> echo 1111 >> file.txt\n\n3> git add file.txt\n\n4> git commit -m \"first commit\"\n[master (root-commit) 711d4d5] first commit\n1 file changed, 1 insertion(+)\ncreate mode 100644 file.txt\n\n5> git checkout -b test\nSwitched to a new branch 'test'\n\n6> echo 2222 >> file.txt\n\n7> git add file.txt\n\n8> git commit -m \"commit on test branch\"\n[test 76d231c] commit on test branch\n1 file changed, 1 insertion(+)\n\n9> git checkout master\nSwitched to branch 'master'\n\n10> echo 3333 >> file.txt\n\n11> git add file.txt\n\n12> git commit -m \"commit on master branch\"\n[master 61c55fd] commit on master branch\n1 file changed, 1 insertion(+)\n\n13> git merge test\nAuto-merging file.txt\nCONFLICT (content): Merge conflict in file.txt\nAutomatic merge failed; fix conflicts and then commit the result.\n\n14> notepad file.txt\n\n15> git add file.txt\n\n16> git commit -m \"merged with test branch\"\n[master 1442e0e] merged with test branch\n\n17> git log\ncommit 1442e0ee728c831e74550329e39d27d4188b4422 (HEAD -> master)\nMerge: 61c55fd 76d231c\nAuthor: isaac <...>\nDate:   Mon Apr 16 15:08:39 2018 -0400\n\n    merged with test branch\n\ncommit 61c55fdb883fc403e63c91b49bc11bdade62b3e8\nAuthor: isaac <...>\nDate:   Mon Apr 16 15:07:41 2018 -0400\n\n    commit on master branch\n\ncommit 76d231cdb12eb84f45abdebede06a56f912613d3 (test)\nAuthor: isaac <...>\nDate:   Mon Apr 16 15:07:07 2018 -0400\n\n    commit on test branch\n\ncommit 711d4d5781df41924421f8629af040e7c91a8d2e\nAuthor: isaac <...>\nDate:   Mon Apr 16 15:06:07 2018 -0400\n\n    first commit\n\n18> echo :1 711d4d5781df41924421f8629af040e7c91a8d2e > git-marks\n\n19> cat git-marks\n:1 711d4d5781df41924421f8629af040e7c91a8d2e\n\n20> git fast-export --use-done-feature --import-marks=git-marks refs/heads/master --\nfeature done\nblob\nmark :2\ndata 12\n1111\n2222\n\ncommit refs/heads/master\nmark :3\nauthor isaac <...> 1523905627 -0400\ncommitter isaac <...> 1523905627 -0400\ndata 22\ncommit on test branch\nfrom :1\nM 100644 :2 file.txt\n\nblob\nmark :4\ndata 12\n1111\n3333\n\ncommit refs/heads/master\nmark :5\nauthor isaac <...> 1523905661 -0400\ncommitter isaac <...> 1523905661 -0400\ndata 24\ncommit on master branch\nfrom :1\nM 100644 :4 file.txt\n\ndone\n\nThanks,\n\nIsaac\n\n"}]}