Fix "git diff --stat" with long filenames

Linus Torvalds · Junio C Hamano · commit 5d6a9f45e1ba · 2006-05-08T10:54:30.000-07:00
When we cut off the front of a filename to make it fit on the line, we add
a "..." in front. However, the way the "git diff" code was written, we
will never reset the prefix back to the empty string, so every single
filename afterwards will have the "..." prefix, whether appropriate or
not.

You can see this with "git diff v2.6.16.." on the current kernel tree,
since there are filenames with long names that changed there:

 [ snip snip ]
 Documentation/filesystems/vfs.txt                  |  229
 .../firmware_class/firmware_sample_driver.c        |    3
 .../firmware_sample_firmware_class.c               |    1
 ...Documentation/fujitsu/frv/kernel-ABI.txt           |  192
 ...Documentation/hwmon/w83627hf                       |    4
 [ snip snip ]

notice how the two Documentation/firmware** filenames caused the "..." to
be added, but then the later filenames don't want it, and it also screws
up the alignment of the line numbering afterwards.

Trivially fixed by moving the declaration (and initial setting) of the
"prefix" variable into the for-loop where it is used.

Signed-off-by: Linus Torvalds &lt;torvalds@osdl.org&gt;
Signed-off-by: Junio C Hamano &lt;junkio@cox.net&gt;
diff --git a/diff.c b/diff.c
@@ -239,7 +239,6 @@ static const char minuses[]= "--------------------------------------------------
 
 static void show_stats(struct diffstat_t* data)
 {
-	char *prefix = "";
 	int i, len, add, del, total, adds = 0, dels = 0;
 	int max, max_change = 0, max_len = 0;
 	int total_files = data->nr;
@@ -261,6 +260,7 @@ static void show_stats(struct diffstat_t* data)
 	}
 
 	for (i = 0; i < data->nr; i++) {
+		char *prefix = "";
 		char *name = data->files[i]->name;
 		int added = data->files[i]->added;
 		int deleted = data->files[i]->deleted;

Original file line number	Diff line number	Diff line change
`@@ -239,7 +239,6 @@ static const char minuses[]= "--------------------------------------------------`
`239`	`239`
`240`	`240`	`static void show_stats(struct diffstat_t* data)`
`241`	`241`	`{`
`242`		`- char *prefix = "";`
`243`	`242`	`int i, len, add, del, total, adds = 0, dels = 0;`
`244`	`243`	`int max, max_change = 0, max_len = 0;`
`245`	`244`	`int total_files = data->nr;`
`@@ -261,6 +260,7 @@ static void show_stats(struct diffstat_t* data)`
`261`	`260`	`}`
`262`	`261`
`263`	`262`	`for (i = 0; i < data->nr; i++) {`
	`263`	`+ char *prefix = "";`
`264`	`264`	`char *name = data->files[i]->name;`
`265`	`265`	`int added = data->files[i]->added;`
`266`	`266`	`int deleted = data->files[i]->deleted;`