summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorLibravatar Will Palmer <wmpalmer@gmail.com>2010-07-14 18:04:07 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-07-14 12:56:49 -0700
commit21baa6e0c56d229866c02c4b42b8b53af648d853 (patch)
tree0f651d69beff4fdcdde40754d0deb8ef8caf0714 /t
parentadd basic tests for merge-tree (diff)
downloadtgif-21baa6e0c56d229866c02c4b42b8b53af648d853.tar.xz
merge-tree: fix where two branches share no changes
15b4f7a (merge-tree: use ll_merge() not xdl_merge(), 2010-01-16) introduced a regression to merge-tree to cause it to segfault when 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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
-rwxr-xr-xt/t4300-merge-tree.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t4300-merge-tree.sh b/t/t4300-merge-tree.sh
index 1eba862369..46c3fe76d3 100755
--- a/t/t4300-merge-tree.sh
+++ b/t/t4300-merge-tree.sh
@@ -24,7 +24,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
@@ -195,7 +195,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
@@ -213,7 +213,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