undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

diff.c: Properly quote file names in diff --summary output.

Browse Source 
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Alexandre Julliard 2007-02-10 15:37:48 +01:00 committed by Junio C Hamano
parent b9f441646c
commit 0d26a64ece
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
diff.c
View File

@ -2409,19 +2409,24 @@ static void flush_one_pair(struct diff_filepair *p, struct diff_options *opt)
static void show_file_mode_name(const char *newdelete, struct diff_filespec *fs) static void show_file_mode_name(const char *newdelete, struct diff_filespec *fs)
{ {
char *name = quote_one(fs->path);
if (fs->mode) if (fs->mode)
printf(" %s mode %06o %s\n", newdelete, fs->mode, fs->path); printf(" %s mode %06o %s\n", newdelete, fs->mode, name);
else else
printf(" %s %s\n", newdelete, fs->path); printf(" %s %s\n", newdelete, name);
free(name);
} }
static void show_mode_change(struct diff_filepair *p, int show_name) static void show_mode_change(struct diff_filepair *p, int show_name)
{ {
if (p->one->mode && p->two->mode && p->one->mode != p->two->mode) { if (p->one->mode && p->two->mode && p->one->mode != p->two->mode) {
if (show_name) if (show_name) {
char *name = quote_one(p->two->path);
printf(" mode change %06o => %06o %s\n", printf(" mode change %06o => %06o %s\n",
p->one->mode, p->two->mode, p->two->path); p->one->mode, p->two->mode, name);
free(name);
}
else else
printf(" mode change %06o => %06o\n", printf(" mode change %06o => %06o\n",
p->one->mode, p->two->mode); p->one->mode, p->two->mode);
@ -2455,8 +2460,10 @@ static void diff_summary(struct diff_filepair *p)
break; break;
default: default:
if (p->score) { if (p->score) {
printf(" rewrite %s (%d%%)\n", p->two->path, char *name = quote_one(p->two->path);
printf(" rewrite %s (%d%%)\n", name,
(int)(0.5 + p->score * 100.0/MAX_SCORE)); (int)(0.5 + p->score * 100.0/MAX_SCORE));
free(name);
show_mode_change(p, 0); show_mode_change(p, 0);
} else show_mode_change(p, 1); } else show_mode_change(p, 1);
break; break;