mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-24 02:17:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

[PATCH] Remove final newline from the value of xfrm_msg variable.

Browse Source 
This change makes the implementation of git-external-diff-script
cleaner.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Junio C Hamano 2005-05-27 15:54:06 -07:00 committed by Linus Torvalds
parent 903d475a0b
commit 09d9d1a648
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
diff.c
View File

@ -141,7 +141,7 @@ static void builtin_diff(const char *name_a,
printf("new mode %s\n", temp[1].mode);
}
if (xfrm_msg && xfrm_msg[0])
fputs(xfrm_msg, stdout);
puts(xfrm_msg);
if (strncmp(temp[0].mode, temp[1].mode, 3))
/* we do not run diff between different kind
@ -622,7 +622,7 @@ static void diff_flush_patch(struct diff_filepair *p)
sprintf(msg_,
"similarity index %d%%\n"
"copy from %s\n"
"copy to %s\n",
"copy to %s",
(int)(0.5 + p->score * 100.0/MAX_SCORE),
p->one->path, p->two->path);
msg = msg_;
@ -631,7 +631,7 @@ static void diff_flush_patch(struct diff_filepair *p)
sprintf(msg_,
"similarity index %d%%\n"
"rename old %s\n"
"rename new %s\n",
"rename new %s",
(int)(0.5 + p->score * 100.0/MAX_SCORE),
p->one->path, p->two->path);
msg = msg_;

2
git-external-diff-script
View File

@ -59,7 +59,7 @@ then
echo "new mode $mode2"
if test "$xfrm_msg" != ""
then
echo -n $xfrm_msg
echo "$xfrm_msg"
fi
fi
diff ${GIT_DIFF_OPTS-'-pu'} -L "a/$name1" -L "b/$name2" "$tmp1" "$tmp2"