summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 903d475)
raw | patch | inline | side by side (parent: 903d475)
author | Junio C Hamano <junkio@cox.net> | |
Fri, 27 May 2005 22:54:06 +0000 (15:54 -0700) | ||
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | |
Sun, 29 May 2005 18:17:43 +0000 (11:17 -0700) |
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>
cleaner.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
diff.c | patch | blob | history | |
git-external-diff-script | patch | blob | history |
index 5031c7d685a8238353b950bbff6a94e00f5c6740..f15eb08ef7597ae7f538724f5814bd5fa87694d6 100644 (file)
--- a/diff.c
+++ b/diff.c
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
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_;
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_;
index 0d34b670bcfc516d352f3bff72bf798ac9832f99..137280ac724ac95fc9784e092868fafcf6c35e8d 100644 (file)
--- a/git-external-diff-script
+++ b/git-external-diff-script
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"