diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-04-17 12:22:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-04-17 17:15:05 -0700 |
| commit | e78cbf8cbb61edfbdef5d33262f9b8cf02a3afca (patch) | |
| tree | 4cf4a58f041d62e22f3876bd4c0c536257f4a331 /t/t7602-merge-octopus-many.sh | |
| parent | builtin/merge.c: collect other parents early (diff) | |
| download | tgif-e78cbf8cbb61edfbdef5d33262f9b8cf02a3afca.tar.xz | |
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/t7602-merge-octopus-many.sh')
| -rwxr-xr-x | t/t7602-merge-octopus-many.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7602-merge-octopus-many.sh b/t/t7602-merge-octopus-many.sh index 83e917b918..7117b57ccc 100755 --- a/t/t7602-merge-octopus-many.sh +++ b/t/t7602-merge-octopus-many.sh @@ -76,7 +76,7 @@ Merge made by the 'recursive' strategy. create mode 100644 c5.c EOF -test_expect_failure 'merge reduces irrelevant remote heads' ' +test_expect_success 'merge reduces irrelevant remote heads' ' GIT_MERGE_VERBOSITY=0 git merge c4 c5 >actual && test_cmp expected actual ' |