summaryrefslogtreecommitdiff
path: root/t/t6028-merge-up-to-date.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-04-17 19:22:26 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-04-18 00:15:05 (GMT)
commite78cbf8cbb61edfbdef5d33262f9b8cf02a3afca (patch)
tree4cf4a58f041d62e22f3876bd4c0c536257f4a331 /t/t6028-merge-up-to-date.sh
parentb5d887f90692515a6e9c99e7683533d12df3ade2 (diff)
downloadgit-e78cbf8cbb61edfbdef5d33262f9b8cf02a3afca.zip
git-e78cbf8cbb61edfbdef5d33262f9b8cf02a3afca.tar.gz
git-e78cbf8cbb61edfbdef5d33262f9b8cf02a3afca.tar.bz2
builtin/merge.c: reduce parents early
Instead of waiting until we record the parents of resulting merge, reduce redundant parents (including our HEAD) immediately after reading them. The change to t7602 illustrates the essence of the effect of this change. The octopus merge strategy used to be fed with redundant commits only to discard them as "up-to-date", but we no longer feed such redundant commits to it and the affected test degenerates to a regular two-head merge. And obviously the known-to-be-broken test in t6028 is now fixed. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6028-merge-up-to-date.sh')
-rwxr-xr-xt/t6028-merge-up-to-date.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6028-merge-up-to-date.sh b/t/t6028-merge-up-to-date.sh
index 824fca5..c518e9c 100755
--- a/t/t6028-merge-up-to-date.sh
+++ b/t/t6028-merge-up-to-date.sh
@@ -79,7 +79,7 @@ test_expect_success 'merge -s subtree up-to-date' '
'
-test_expect_failure 'merge fast-forward octopus' '
+test_expect_success 'merge fast-forward octopus' '
git reset --hard c0 &&
test_tick &&