summaryrefslogtreecommitdiff
path: root/t/t4200-rerere.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-04-03 23:28:46 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-04-04 02:01:36 (GMT)
commiteb3359663d62f35999330797455dbe738bd5ed99 (patch)
treead96b70ce6f5834453867fa4dbd422cc767c09a8 /t/t4200-rerere.sh
parent3ac53e0d13fa7483cce90eb6a1cfcdcbda5b8e35 (diff)
downloadgit-eb3359663d62f35999330797455dbe738bd5ed99.zip
git-eb3359663d62f35999330797455dbe738bd5ed99.tar.gz
git-eb3359663d62f35999330797455dbe738bd5ed99.tar.bz2
rerere should not repeat the earlier hunks in later ones
When a file has more then one conflicting hunks, it repeated the contents of previous hunks in output for later ones. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't/t4200-rerere.sh')
-rwxr-xr-xt/t4200-rerere.sh21
1 files changed, 17 insertions, 4 deletions
diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh
index c571a1b..69b8d26 100755
--- a/t/t4200-rerere.sh
+++ b/t/t4200-rerere.sh
@@ -34,7 +34,8 @@ EOF
git commit -q -a -m first
git checkout -b second master
-git show first:a1 | sed 's/To die, t/To die! T/' > a1
+git show first:a1 |
+sed -e 's/To die, t/To die! T/' -e 's/life;$/life./' > a1
git commit -q -a -m second
# activate rerere
@@ -42,19 +43,26 @@ mkdir .git/rr-cache
test_expect_failure 'conflicting merge' 'git pull . first'
-sha1=4f58849a60b4f969a2848966b6d02893b783e8fb
+sha1=$(sed -e 's/\t.*//' .git/rr-cache/MERGE_RR)
rr=.git/rr-cache/$sha1
test_expect_success 'recorded preimage' "grep ======= $rr/preimage"
test_expect_success 'no postimage or thisimage yet' \
"test ! -f $rr/postimage -a ! -f $rr/thisimage"
+test_expect_success 'preimage have right number of lines' '
+
+ cnt=$(sed -ne "/^<<<<<<</,/^>>>>>>>/p" $rr/preimage | wc -l) &&
+ test "$cnt" = 10
+
+'
+
git show first:a1 > a1
cat > expect << EOF
--- a/a1
+++ b/a1
-@@ -6,11 +6,7 @@
+@@ -6,17 +6,9 @@
The heart-ache and the thousand natural shocks
That flesh is heir to, 'tis a consummation
Devoutly to be wish'd.
@@ -66,8 +74,13 @@ cat > expect << EOF
To sleep: perchance to dream: ay, there's the rub;
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;
+->>>>>>>
EOF
-
git rerere diff > out
test_expect_success 'rerere diff' 'diff -u expect out'