diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-04-04 14:12:03 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-04-04 14:12:03 -0700 |
| commit | 2b93edbf32700d91c500806e4502077829d66d21 (patch) | |
| tree | a2e9a4709978fe8af2bf0ed9da371ec8c90db109 /t/t4200-rerere.sh | |
| parent | 364b8523529163ffeeb71521239a18ac1f550512 (diff) | |
| download | git-2b93edbf32700d91c500806e4502077829d66d21.tar.gz | |
rerere: make sorting really stable.
The earlier code does not swap hunks when the beginning of the
first side is identical to the whole of the second side. In
such a case, the first one should sort later.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't/t4200-rerere.sh')
| -rwxr-xr-x | t/t4200-rerere.sh | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh index bc878d750d..6ba63d7173 100755 --- a/t/t4200-rerere.sh +++ b/t/t4200-rerere.sh @@ -35,7 +35,8 @@ git commit -q -a -m first git checkout -b second master git show first:a1 | -sed -e 's/To die, t/To die! T/' -e 's/life;$/life./' > a1 +sed -e 's/To die, t/To die! T/' > a1 +echo "* END *" >>a1 git commit -q -a -m second # activate rerere @@ -53,7 +54,7 @@ test_expect_success 'no postimage or thisimage yet' \ test_expect_success 'preimage has right number of lines' ' cnt=$(sed -ne "/^<<<<<<</,/^>>>>>>>/p" $rr/preimage | wc -l) && - test $cnt = 10 + test $cnt = 9 ' @@ -75,10 +76,10 @@ cat > expect << EOF For in that sleep of death what dreams may come When we have shuffled off this mortal coil, Must give us pause: there's the respect + That makes calamity of so long life; -<<<<<<< --That makes calamity of so long life. -======= - That makes calamity of so long life; +-* END * ->>>>>>> EOF git rerere diff > out |