{"thread":{"id":"24396","subject":"[PATCHv3 1/2] add basic tests for merge-tree","startedAt":"2010-07-14T17:04:05Z","lastAt":"2010-07-14T19:59:29Z","messageCount":4,"participants":["Will Palmer","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"145561","messageId":"1279127047-3273-1-git-send-email-wmpalmer@gmail.com","threadId":"24396","inReplyTo":null,"subject":"[PATCHv3 0/2] merge-tree: fix (merge-base a b) b a","fromName":"Will Palmer","fromEmail":"wmpalmer@gmail.com","sentAt":"2010-07-14T17:04:05Z","receivedAt":"2010-07-14T17:04:05Z","isPatch":false,"sender":{"key":"wmpalmer@gmail.com","avatar":"https://avatars.githubusercontent.com/u/357044?v=4"},"body":"This series notes, then fixes, a regression introduced by\n15b4f7a68d8c3c8ee28424415b203f61202d65d1 /\n\tmerge-tree: use ll_merge() not xdl_merge()\n\nI don't know the proper terminology to describe what's being fixed here.\nThis seems to most-easily be triggered by (for example):\n\tgit merge-tree $(git merge-base HEAD @{u}) HEAD @{u}\n\nIn the git repository at the moment, this could be triggered with:\n\tgit merge-tree $(git merge-base origin/next origin/master) \\\n\t\torigin/next origin/master\n\nThough as I write this, next has only just been merged with master, so\nthat is not the case. For an example which is less likely to go away,\ntry:\n\tgit merge-tree c9eaaab4165d8f402930d12899ec097495b599e6 \\\n\t\tbe16ac8cc8ce693c6adf37b80db65d10a41b4eb9 \\\n\t\t9918285fb10d81af9021dae99c5f4de88ded497c\n\nIt's actually very trivial to reproduce this, to the point where I\ncan't help but wonder how much merge-tree is actually being used. As\nI narrowed the test-case more and more, I was surprised by how little\nit took to trigger it. The first patch in this series includes some\nvery basic tests for merge-tree, the last of which demonstrates the\nregression.\n\nThe second patch implements the trivial fix for it.\n\nThis is the third version of the patch. The first version of the patch\nincluded very trivial tests for merge-tree, which were really only\nintended to demonstrate the breakage being fixed. The second version of\nthe patch included proper tests, with real \"expected vs actual\"\ntesting, rather than dumb \"did it return successfully?\" checks. This\nversion of the patch escapes the HERE documents, since they didn't\nrequire any expansions; joins up the remaining commands in && groups;\nand fixes a couple of lines which went beyond column 80.\n\n\nWill Palmer (2):\n  add basic tests for merge-tree\n  fix merge-tree where two branches share no changes\n\n builtin/merge-tree.c  |    3 +-\n t/t4300-merge-tree.sh |  257 +++++++++++++++++++++++++++++++++++++++++++++++++\n 2 files changed, 259 insertions(+), 1 deletions(-)\n create mode 100755 t/t4300-merge-tree.sh\n\n-- \n1.7.1.703.g42c01\n"},{"id":"145559","messageId":"1279127047-3273-2-git-send-email-wmpalmer@gmail.com","threadId":"24396","inReplyTo":"1279127047-3273-1-git-send-email-wmpalmer@gmail.com","subject":"[PATCHv3 1/2] add basic tests for merge-tree","fromName":"Will Palmer","fromEmail":"wmpalmer@gmail.com","sentAt":"2010-07-14T17:04:06Z","receivedAt":"2010-07-14T17:04:06Z","isPatch":false,"sender":{"key":"wmpalmer@gmail.com","avatar":"https://avatars.githubusercontent.com/u/357044?v=4"},"body":"merge-tree had no test cases, so here we add some very basic tests for\nit, including some known-breakages.\n\nSigned-off-by: Will Palmer <wmpalmer@gmail.com>\n---\n t/t4300-merge-tree.sh |  257 +++++++++++++++++++++++++++++++++++++++++++++++++\n 1 files changed, 257 insertions(+), 0 deletions(-)\n create mode 100755 t/t4300-merge-tree.sh\n\ndiff --git a/t/t4300-merge-tree.sh b/t/t4300-merge-tree.sh\nnew file mode 100755\nindex 0000000..c02c986\n--- /dev/null\n+++ b/t/t4300-merge-tree.sh\n@@ -0,0 +1,257 @@\n+#!/bin/sh\n+#\n+# Copyright (c) 2010 Will Palmer\n+#\n+\n+test_description='git merge-tree'\n+. ./test-lib.sh\n+\n+test_expect_success setup '\n+\ttest_commit \"initial\" \"initial-file\" \"initial\"\n+'\n+\n+test_expect_'file add A, !B' '\n+\tcat >expected <<\\EXPECTED\n+added in remote\n+  their  100644 43d5a8ed6ef6c00ff775008633f95787d088285d ONE\n+@@ -0,0 +1 @@\n++AAA\n+EXPECTED\n+\n+\tgit reset --hard initial &&\n+\ttest_commit \"add-a-not-b\" \"ONE\" \"AAA\" &&\n+\tgit merge-tree initial initial add-a-not-b >actual &&\n+\ttest_cmp expected actual\n+'\n+\n+test_expect_failure 'file add !A, B' '\n+\tcat >expected <<\\EXPECTED\n+added in local\n+  our    100644 43d5a8ed6ef6c00ff775008633f95787d088285d ONE\n+EXPECTED\n+\n+\tgit reset --hard initial &&\n+\ttest_commit \"add-not-a-b\" \"ONE\" \"AAA\" &&\n+\tgit merge-tree initial add-not-a-b initial >actual &&\n+\ttest_cmp expected actual\n+'\n+\n+test_expect_success 'file add A, B (same)' '\n+\tcat >expected <<\\EXPECTED\n+added in both\n+  our    100644 43d5a8ed6ef6c00ff775008633f95787d088285d ONE\n+  their  100644 43d5a8ed6ef6c00ff775008633f95787d088285d ONE\n+EXPECTED\n+\n+\tgit reset --hard initial &&\n+\ttest_commit \"add-a-b-same-A\" \"ONE\" \"AAA\" &&\n+\tgit reset --hard initial &&\n+\ttest_commit \"add-a-b-same-B\" \"ONE\" \"AAA\" &&\n+\tgit merge-tree initial add-a-b-same-A add-a-b-same-B >actual &&\n+\ttest_cmp expected actual\n+'\n+\n+test_expect_success 'file add A, B (different)' '\n+\tcat >expected <<\\EXPECTED\n+added in both\n+  our    100644 43d5a8ed6ef6c00ff775008633f95787d088285d ONE\n+  their  100644 ba629238ca89489f2b350e196ca445e09d8bb834 ONE\n+@@ -1 +1,5 @@\n++<<<<<<< .our\n+ AAA\n++=======\n++BBB\n++>>>>>>> .their\n+EXPECTED\n+\n+\tgit reset --hard initial &&\n+\ttest_commit \"add-a-b-diff-A\" \"ONE\" \"AAA\" &&\n+\tgit reset --hard initial &&\n+\ttest_commit \"add-a-b-diff-B\" \"ONE\" \"BBB\" &&\n+\tgit merge-tree initial add-a-b-diff-A add-a-b-diff-B >actual &&\n+\ttest_cmp expected actual\n+'\n+\n+test_expect_success 'file change A, !B' '\n+\tcat >expected <<\\EXPECTED\n+EXPECTED\n+\n+\tgit reset --hard initial &&\n+\ttest_commit \"change-a-not-b\" \"initial-file\" \"BBB\" &&\n+\tgit merge-tree initial change-a-not-b initial >actual &&\n+\ttest_cmp expected actual\n+'\n+\n+test_expect_success 'file change !A, B' '\n+\tcat >expected <<\\EXPECTED\n+merged\n+  result 100644 ba629238ca89489f2b350e196ca445e09d8bb834 initial-file\n+  our    100644 e79c5e8f964493290a409888d5413a737e8e5dd5 initial-file\n+@@ -1 +1 @@\n+-initial\n++BBB\n+EXPECTED\n+\n+\tgit reset --hard initial &&\n+\ttest_commit \"change-not-a-b\" \"initial-file\" \"BBB\" &&\n+\tgit merge-tree initial initial change-not-a-b >actual &&\n+\ttest_cmp expected actual\n+'\n+\n+test_expect_success 'file change A, B (same)' '\n+\tcat >expected <<\\EXPECTED\n+EXPECTED\n+\n+\tgit reset --hard initial &&\n+\ttest_commit \"change-a-b-same-A\" \"initial-file\" \"AAA\" &&\n+\tgit reset --hard initial &&\n+\ttest_commit \"change-a-b-same-B\" \"initial-file\" \"AAA\" &&\n+\tgit merge-tree initial change-a-b-same-A change-a-b-same-B >actual &&\n+\ttest_cmp expected actual\n+'\n+\n+test_expect_success 'file change A, B (different)' '\n+\tcat >expected <<\\EXPECTED\n+changed in both\n+  base   100644 e79c5e8f964493290a409888d5413a737e8e5dd5 initial-file\n+  our    100644 43d5a8ed6ef6c00ff775008633f95787d088285d initial-file\n+  their  100644 ba629238ca89489f2b350e196ca445e09d8bb834 initial-file\n+@@ -1 +1,5 @@\n++<<<<<<< .our\n+ AAA\n++=======\n++BBB\n++>>>>>>> .their\n+EXPECTED\n+\n+\tgit reset --hard initial &&\n+\ttest_commit \"change-a-b-diff-A\" \"initial-file\" \"AAA\" &&\n+\tgit reset --hard initial &&\n+\ttest_commit \"change-a-b-diff-B\" \"initial-file\" \"BBB\" &&\n+\tgit merge-tree initial change-a-b-diff-A change-a-b-diff-B >actual &&\n+\ttest_cmp expected actual\n+'\n+\n+test_expect_success 'file change A, B (mixed)' '\n+\tcat >expected <<\\EXPECTED\n+changed in both\n+  base   100644 f4f1f998c7776568c4ff38f516d77fef9399b5a7 ONE\n+  our    100644 af14c2c3475337c73759d561ef70b59e5c731176 ONE\n+  their  100644 372d761493f524d44d59bd24700c3bdf914c973c ONE\n+@@ -7,7 +7,11 @@\n+ AAA\n+ AAA\n+ AAA\n++<<<<<<< .our\n+ BBB\n++=======\n++CCC\n++>>>>>>> .their\n+ AAA\n+ AAA\n+ AAA\n+EXPECTED\n+\n+\tgit reset --hard initial &&\n+\ttest_commit \"change-a-b-mix-base\" \"ONE\" \"\n+AAA\n+AAA\n+AAA\n+AAA\n+AAA\n+AAA\n+AAA\n+AAA\n+AAA\n+AAA\n+AAA\n+AAA\n+AAA\n+AAA\n+AAA\" &&\n+\ttest_commit \"change-a-b-mix-A\" \"ONE\" \\\n+\t\t\"$(sed -e \"1{s/AAA/BBB/;}\" -e \"10{s/AAA/BBB/;}\" <ONE)\" &&\n+\tgit reset --hard change-a-b-mix-base &&\n+\ttest_commit \"change-a-b-mix-B\" \"ONE\" \\\n+\t\t\"$(sed -e \"1{s/AAA/BBB/;}\" -e \"10{s/AAA/CCC/;}\" <ONE)\" &&\n+\tgit merge-tree change-a-b-mix-base change-a-b-mix-A change-a-b-mix-B \\\n+\t\t>actual &&\n+\ttest_cmp expected actual\n+'\n+\n+test_expect_success 'file remove A, !B' '\n+\tcat >expected <<\\EXPECTED\n+removed in local\n+  base   100644 43d5a8ed6ef6c00ff775008633f95787d088285d ONE\n+  their  100644 43d5a8ed6ef6c00ff775008633f95787d088285d ONE\n+EXPECTED\n+\n+\tgit reset --hard initial &&\n+\ttest_commit \"rm-a-not-b-base\" \"ONE\" \"AAA\" &&\n+\tgit rm ONE &&\n+\tgit commit -m \"rm-a-not-b\" &&\n+\tgit tag \"rm-a-not-b\" &&\n+\tgit merge-tree rm-a-not-b-base rm-a-not-b rm-a-not-b-base >actual &&\n+\ttest_cmp expected actual\n+'\n+\n+test_expect_failure 'file remove !A, B' '\n+\tcat >expected <<\\EXPECTED\n+removed in remote\n+  base   100644 43d5a8ed6ef6c00ff775008633f95787d088285d ONE\n+  our    100644 43d5a8ed6ef6c00ff775008633f95787d088285d ONE\n+@@ -1 +0,0 @@\n+-AAA\n+EXPECTED\n+\n+\tgit reset --hard initial &&\n+\ttest_commit \"rm-not-a-b-base\" \"ONE\" \"AAA\" &&\n+\tgit rm ONE &&\n+\tgit commit -m \"rm-not-a-b\" &&\n+\tgit tag \"rm-not-a-b\" &&\n+\tgit merge-tree rm-a-not-b-base rm-a-not-b-base rm-a-not-b >actual &&\n+\ttest_cmp expected actual\n+'\n+\n+test_expect_failure 'file change A, remove B' '\n+\tcat >expected <<\\EXPECTED\n+removed in remote\n+  base   100644 43d5a8ed6ef6c00ff775008633f95787d088285d ONE\n+  our    100644 ba629238ca89489f2b350e196ca445e09d8bb834 ONE\n+@@ -1 +0,0 @@\n+-BBB\n+EXPECTED\n+\n+\tgit reset --hard initial &&\n+\ttest_commit \"change-a-rm-b-base\" \"ONE\" \"AAA\" &&\n+\ttest_commit \"change-a-rm-b-A\" \"ONE\" \"BBB\" &&\n+\tgit reset --hard change-a-rm-b-base &&\n+\tgit rm ONE &&\n+\tgit commit -m \"change-a-rm-b-B\" &&\n+\tgit tag \"change-a-rm-b-B\" &&\n+\tgit merge-tree change-a-rm-b-base change-a-rm-b-A change-a-rm-b-B \\\n+\t\t>actual &&\n+\ttest_cmp expected actual\n+'\n+\n+test_expect_success 'file remove A, change B' '\n+\tcat >expected <<\\EXPECTED\n+removed in local\n+  base   100644 43d5a8ed6ef6c00ff775008633f95787d088285d ONE\n+  their  100644 ba629238ca89489f2b350e196ca445e09d8bb834 ONE\n+EXPECTED\n+\n+\tgit reset --hard initial &&\n+\ttest_commit \"rm-a-change-b-base\" \"ONE\" \"AAA\" &&\n+\n+\tgit rm ONE &&\n+\tgit commit -m \"rm-a-change-b-A\" &&\n+\tgit tag \"rm-a-change-b-A\" &&\n+\tgit reset --hard rm-a-change-b-base &&\n+\ttest_commit \"rm-a-change-b-B\" \"ONE\" \"BBB\" &&\n+\tgit merge-tree rm-a-change-b-base rm-a-change-b-A rm-a-change-b-B \\\n+\t\t>actual &&\n+\ttest_cmp expected actual\n+'\n+\n+test_done\n-- \n1.7.1.703.g42c01\n"},{"id":"145560","messageId":"1279127047-3273-3-git-send-email-wmpalmer@gmail.com","threadId":"24396","inReplyTo":"1279127047-3273-1-git-send-email-wmpalmer@gmail.com","subject":"[PATCHv3 2/2] fix merge-tree where two branches share no changes","fromName":"Will Palmer","fromEmail":"wmpalmer@gmail.com","sentAt":"2010-07-14T17:04:07Z","receivedAt":"2010-07-14T17:04:07Z","isPatch":false,"sender":{"key":"wmpalmer@gmail.com","avatar":"https://avatars.githubusercontent.com/u/357044?v=4"},"body":"Here we fix a regression which was introduced by\n15b4f7a68d8c3c8ee28424415b203f61202d65d1 /\n\tmerge-tree: use ll_merge() not xdl_merge()\n\nWhich caused merge-tree to segfault in particular combinations of\nmerging files which existed in one branch, but not in the other or in\nthe merge-base. This was caused by referencing entry->path at a time\nwhen entry was known to be possibly-NULL.\n\nTo correct the problem, we save the path of the entry we came in with,\nas the path should be the same among all the stages no matter which\nsides are involved in the merge.\n\nSigned-off-by: Will Palmer <wmpalmer@gmail.com>\n---\n builtin/merge-tree.c  |    3 ++-\n t/t4300-merge-tree.sh |    6 +++---\n 2 files changed, 5 insertions(+), 4 deletions(-)\n\ndiff --git a/builtin/merge-tree.c b/builtin/merge-tree.c\nindex fc00d79..9b25ddc 100644\n--- a/builtin/merge-tree.c\n+++ b/builtin/merge-tree.c\n@@ -60,6 +60,7 @@ static void *result(struct merge_list *entry, unsigned long *size)\n {\n \tenum object_type type;\n \tstruct blob *base, *our, *their;\n+\tconst char *path = entry->path;\n \n \tif (!entry->stage)\n \t\treturn read_sha1_file(entry->blob->object.sha1, &type, size);\n@@ -76,7 +77,7 @@ static void *result(struct merge_list *entry, unsigned long *size)\n \ttheir = NULL;\n \tif (entry)\n \t\ttheir = entry->blob;\n-\treturn merge_file(entry->path, base, our, their, size);\n+\treturn merge_file(path, base, our, their, size);\n }\n \n static void *origin(struct merge_list *entry, unsigned long *size)\ndiff --git a/t/t4300-merge-tree.sh b/t/t4300-merge-tree.sh\nindex c02c986..4d0920c 100755\n--- a/t/t4300-merge-tree.sh\n+++ b/t/t4300-merge-tree.sh\n@@ -24,7 +24,7 @@ EXPECTED\n \ttest_cmp expected actual\n '\n \n-test_expect_failure 'file add !A, B' '\n+test_expect_success 'file add !A, B' '\n \tcat >expected <<\\EXPECTED\n added in local\n   our    100644 43d5a8ed6ef6c00ff775008633f95787d088285d ONE\n@@ -195,7 +195,7 @@ EXPECTED\n \ttest_cmp expected actual\n '\n \n-test_expect_failure 'file remove !A, B' '\n+test_expect_success 'file remove !A, B' '\n \tcat >expected <<\\EXPECTED\n removed in remote\n   base   100644 43d5a8ed6ef6c00ff775008633f95787d088285d ONE\n@@ -213,7 +213,7 @@ EXPECTED\n \ttest_cmp expected actual\n '\n \n-test_expect_failure 'file change A, remove B' '\n+test_expect_success 'file change A, remove B' '\n \tcat >expected <<\\EXPECTED\n removed in remote\n   base   100644 43d5a8ed6ef6c00ff775008633f95787d088285d ONE\n-- \n1.7.1.703.g42c01\n"},{"id":"145579","messageId":"7veif5ygv2.fsf@alter.siamese.dyndns.org","threadId":"24396","inReplyTo":"1279127047-3273-2-git-send-email-wmpalmer@gmail.com","subject":"Re: [PATCHv3 1/2] add basic tests for merge-tree","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2010-07-14T19:59:29Z","receivedAt":"2010-07-14T19:59:29Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Will Palmer <wmpalmer@gmail.com> writes:\n\n> merge-tree had no test cases, so here we add some very basic tests for\n> it, including some known-breakages.\n>\n> Signed-off-by: Will Palmer <wmpalmer@gmail.com>\n> ---\n> diff --git a/t/t4300-merge-tree.sh b/t/t4300-merge-tree.sh\n> new file mode 100755\n> index 0000000..c02c986\n> --- /dev/null\n> +++ b/t/t4300-merge-tree.sh\n> @@ -0,0 +1,257 @@\n> ...\n> +test_expect_'file add A, !B' '\n\nOops?\n\nI'll queue with obvious/trivial fixups.  Thanks.\n"}]}