diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-04-17 19:22:26 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-04-18 00:15:05 (GMT) |
| commit | e78cbf8cbb61edfbdef5d33262f9b8cf02a3afca (patch) | |
| tree | 4cf4a58f041d62e22f3876bd4c0c536257f4a331 /t/t7603-merge-reduce-heads.sh | |
| parent | b5d887f90692515a6e9c99e7683533d12df3ade2 (diff) | |
| download | git-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/t7603-merge-reduce-heads.sh')
| -rwxr-xr-x | t/t7603-merge-reduce-heads.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7603-merge-reduce-heads.sh b/t/t7603-merge-reduce-heads.sh index f2934e8..a3b08a6 100755 --- a/t/t7603-merge-reduce-heads.sh +++ b/t/t7603-merge-reduce-heads.sh @@ -119,7 +119,7 @@ test_expect_success 'fast-forward to redundant refs' ' git merge c4 c5 ' -test_expect_failure 'verify merge result' ' +test_expect_success 'verify merge result' ' test $(git rev-parse HEAD) = $(git rev-parse c5) ' |