diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-02-01 00:06:11 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-02-01 00:06:11 -0800 |
commit | 153559a964f436aeb909e3b7e86ceaa998aeed68 (patch) | |
tree | a6f3e2ea703d3899a0447ec2610b8d3a73d7a4dd /t | |
parent | Merge branch 'bg/maint-add-all-doc' into maint-1.6.5 (diff) | |
parent | octopus: remove dead code (diff) | |
download | tgif-153559a964f436aeb909e3b7e86ceaa998aeed68.tar.xz |
Merge branch 'sb/maint-octopus' into maint-1.6.5
* sb/maint-octopus:
octopus: remove dead code
octopus: reenable fast-forward merges
octopus: make merge process simpler to follow
Diffstat (limited to 't')
-rwxr-xr-x | t/t7602-merge-octopus-many.sh | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/t/t7602-merge-octopus-many.sh b/t/t7602-merge-octopus-many.sh index 01e5415e94..2746169514 100755 --- a/t/t7602-merge-octopus-many.sh +++ b/t/t7602-merge-octopus-many.sh @@ -49,4 +49,55 @@ test_expect_success 'merge c1 with c2, c3, c4, ... c29' ' done ' +cat >expected <<\EOF +Trying simple merge with c2 +Trying simple merge with c3 +Trying simple merge with c4 +Merge made by octopus. + c2.c | 1 + + c3.c | 1 + + c4.c | 1 + + 3 files changed, 3 insertions(+), 0 deletions(-) + create mode 100644 c2.c + create mode 100644 c3.c + create mode 100644 c4.c +EOF + +test_expect_success 'merge output uses pretty names' ' + git reset --hard c1 && + git merge c2 c3 c4 >actual && + test_cmp actual expected +' + +cat >expected <<\EOF +Already up-to-date with c4 +Trying simple merge with c5 +Merge made by octopus. + c5.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + create mode 100644 c5.c +EOF + +test_expect_success 'merge up-to-date output uses pretty names' ' + git merge c4 c5 >actual && + test_cmp actual expected +' + +cat >expected <<\EOF +Fast-forwarding to: c1 +Trying simple merge with c2 +Merge made by octopus. + c1.c | 1 + + c2.c | 1 + + 2 files changed, 2 insertions(+), 0 deletions(-) + create mode 100644 c1.c + create mode 100644 c2.c +EOF + +test_expect_success 'merge fast-forward output uses pretty names' ' + git reset --hard c0 && + git merge c1 c2 >actual && + test_cmp actual expected +' + test_done |