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>

diff --git a/builtin-rerere.c b/builtin-rerere.c
index 58c5fed91d9d8f2f0fd573f5621344f795f1c11c..004eda2acdf9b8ac5a66f9717d2244613b23768e 100644 (file)
--- a/builtin-rerere.c
+++ b/builtin-rerere.c
@@ -78,6 +78,13 @@ static void append_line(struct buffer *buffer, const char *line)
        buffer->nr += len;
 }
 
        buffer->nr += len;
 }
 

+static void clear_buffer(struct buffer *buffer)
+{
+       free(buffer->ptr);
+       buffer->ptr = NULL;
+       buffer->nr = buffer->alloc = 0;
+}
+

 static int handle_file(const char *path,
         unsigned char *sha1, const char *output)
 {
 static int handle_file(const char *path,
         unsigned char *sha1, const char *output)
 {


@@ -131,6 +138,8 @@ static int handle_file(const char *path,
                                SHA1_Update(&ctx, two->ptr, two->nr);
                                SHA1_Update(&ctx, "\0", 1);
                        }
                                SHA1_Update(&ctx, two->ptr, two->nr);
                                SHA1_Update(&ctx, "\0", 1);
                        }

+                       clear_buffer(one);
+                       clear_buffer(two);

                } else if (hunk == 1)
                        append_line(one, buf);
                else if (hunk == 2)
                } else if (hunk == 1)
                        append_line(one, buf);
                else if (hunk == 2)

diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh
index c571a1bd744582c6be68504887cf8620514603b8..69b8d26cd13b2fad7b84b9b37e240188aaf085b4 100755 (executable)
--- 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 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
 git commit -q -a -m second
 
 # activate rerere


@@ -42,19 +43,26 @@ mkdir .git/rr-cache
 
 test_expect_failure 'conflicting merge' 'git pull . first'
 
 
 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"
 
 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
 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.
  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,
  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
 EOF

-

 git rerere diff > out
 
 test_expect_success 'rerere diff' 'diff -u expect out'
 git rerere diff > out
 
 test_expect_success 'rerere diff' 'diff -u expect out'