summaryrefslogtreecommitdiff
path: root/t/t7602-merge-octopus-many.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-04-27 20:59:20 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-04-27 20:59:20 (GMT)
commit283097e9ed751b866c9d405d17c21a10bfb9465f (patch)
treee20c55dabe9fc286dc41cb78434507f21c821e4d /t/t7602-merge-octopus-many.sh
parent7b864abe0b0e9cf090d890195cdbdec2edf328a9 (diff)
parent5802f81b1438fdbfab340c4e752e2be457c4a065 (diff)
downloadgit-283097e9ed751b866c9d405d17c21a10bfb9465f.zip
git-283097e9ed751b866c9d405d17c21a10bfb9465f.tar.gz
git-283097e9ed751b866c9d405d17c21a10bfb9465f.tar.bz2
Merge branch 'jc/merge-reduce-parents-early'
Octopus merge strategy did not reduce heads that are recorded in the final commit correctly. By Junio C Hamano (4) and MichaƂ Kiedrowicz (1) * jc/merge-reduce-parents-early: fmt-merge-msg: discard needless merge parents builtin/merge.c: reduce parents early builtin/merge.c: collect other parents early builtin/merge.c: remove "remoteheads" global variable merge tests: octopus with redundant parents
Diffstat (limited to 't/t7602-merge-octopus-many.sh')
-rwxr-xr-xt/t7602-merge-octopus-many.sh8
1 files changed, 3 insertions, 5 deletions
diff --git a/t/t7602-merge-octopus-many.sh b/t/t7602-merge-octopus-many.sh
index bce0bd3..3b72c09 100755
--- a/t/t7602-merge-octopus-many.sh
+++ b/t/t7602-merge-octopus-many.sh
@@ -70,16 +70,14 @@ test_expect_success 'merge output uses pretty names' '
'
cat >expected <<\EOF
-Already up-to-date with c4
-Trying simple merge with c5
-Merge made by the 'octopus' strategy.
+Merge made by the 'recursive' strategy.
c5.c | 1 +
1 file changed, 1 insertion(+)
create mode 100644 c5.c
EOF
-test_expect_success 'merge up-to-date output uses pretty names' '
- git merge c4 c5 >actual &&
+test_expect_success 'merge reduces irrelevant remote heads' '
+ GIT_MERGE_VERBOSITY=0 git merge c4 c5 >actual &&
test_i18ncmp expected actual
'