[PATCHv2 2/2] fix merge-tree where two branches share no changes
- From
Will Palmer <wmpalmer@gmail.com>
- Date
- Jul 11, 2010, 13:16 UTC
- Message-ID
- <1278854215-9022-3-git-send-email-wmpalmer@gmail.com>
- In-Reply-To
- <1278854215-9022-1-git-send-email-wmpalmer@gmail.com>
Here we fix a regression which was introduced by 15b4f7a68d8c3c8ee28424415b203f61202d65d1 / merge-tree: use ll_merge() not xdl_merge()
Which caused merge-tree to segfault in particular combinations of merging files which existed in one branch, but not in the other or in the merge-base. This was caused by referencing entry->path at a time when entry was known to be possibly-NULL.
To correct the problem, we save the path of the entry we came in with, as the path should be the same among all the stages no matter which sides are involved in the merge.
Signed-off-by: Will Palmer <wmpalmer@gmail.com> --- builtin/merge-tree.c | 3 ++- t/t4300-merge-tree.sh | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c index fc00d79..9b25ddc 100644 --- a/builtin/merge-tree.c +++ b/builtin/merge-tree.c @@ -60,6 +60,7 @@ static void *result(struct merge_list *entry, unsigned long *size) { enum object_type type; struct blob *base, *our, *their; + const char *path = entry->path; if (!entry->stage) return read_sha1_file(entry->blob->object.sha1, &type, size); @@ -76,7 +77,7 @@ static void *result(struct merge_list *entry, unsigned long *size) their = NULL; if (entry) their = entry->blob; - return merge_file(entry->path, base, our, their, size); + return merge_file(path, base, our, their, size); } static void *origin(struct merge_list *entry, unsigned long *size) diff --git a/t/t4300-merge-tree.sh b/t/t4300-merge-tree.sh index b2ae3a1..5feff91 100755 --- a/t/t4300-merge-tree.sh +++ b/t/t4300-merge-tree.sh @@ -25,7 +25,7 @@ EXPECTED test_cmp expected actual ' -test_expect_failure 'file add !A, B' ' +test_expect_success 'file add !A, B' ' cat >expected <<EXPECTED added in local our 100644 43d5a8ed6ef6c00ff775008633f95787d088285d ONE @@ -210,7 +210,7 @@ EXPECTED test_cmp expected actual ' -test_expect_failure 'file remove !A, B' ' +test_expect_success 'file remove !A, B' ' cat >expected <<EXPECTED removed in remote base 100644 43d5a8ed6ef6c00ff775008633f95787d088285d ONE @@ -230,7 +230,7 @@ EXPECTED test_cmp expected actual ' -test_expect_failure 'file change A, remove B' ' +test_expect_success 'file change A, remove B' ' cat >expected <<EXPECTED removed in remote base 100644 43d5a8ed6ef6c00ff775008633f95787d088285d ONE
-- 1.7.1.703.g42c01