combine-diff: fix placement of deletion.

The code misplaced a raw hunk that consists of solely deleted
lines by one line.  This showed e.g. Len's 12-way octopus
(9fdb62af in the linux-2.6), kernel/power/disk.c, hunk starting
at line 95, incorrectly.

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/combine-diff.c b/combine-diff.c
index 8f295c89d0e75647f6bac0b370b8f25f5ebe5ec3..36363bddac0e23bf23a923d8bab5c6ea261c894e 100644 (file)
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -235,7 +235,10 @@ static void combine_diff(const unsigned char *parent, const char *ourtmp,
                                 */
                                nb = 1;
                        }
-                       lost_bucket = &sline[nb-1]; /* sline is 0 based */
+                       if (nn == 0)
+                               lost_bucket = &sline[nb];
+                       else
+                               lost_bucket = &sline[nb-1];
                        continue;
                }
                if (!lost_bucket)
@@ -627,6 +630,15 @@ int show_combined_diff(struct combine_diff_path *elem, int num_parent,
                else
                        printf("%s", elem->path);
                putchar('\n');
+               printf("index ");
+               for (i = 0; i < num_parent; i++) {
+                       printf("%s%s",
+                              i ? ".." : "",
+                              find_unique_abbrev(elem->parent_sha1[i],
+                                                 DEFAULT_ABBREV));
+               }
+               printf("->%s\n",
+                      find_unique_abbrev(elem->sha1, DEFAULT_ABBREV));
                dump_sline(sline, cnt, num_parent);
        }
        if (ourtmp == ourtmp_buf)