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

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>

diff --git a/diff.c b/diff.c
index 5031c7d685a8238353b950bbff6a94e00f5c6740..f15eb08ef7597ae7f538724f5814bd5fa87694d6 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -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])
                        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
 
                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"
                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_;
                        (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"
                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_;
                        (int)(0.5 + p->score * 100.0/MAX_SCORE),
                        p->one->path, p->two->path);
                msg = msg_;

diff --git a/git-external-diff-script b/git-external-diff-script
index 0d34b670bcfc516d352f3bff72bf798ac9832f99..137280ac724ac95fc9784e092868fafcf6c35e8d 100644 (file)
--- a/git-external-diff-script
+++ b/git-external-diff-script
@@ -59,7 +59,7 @@ then
     echo "new mode $mode2"
     if test "$xfrm_msg" != ""
     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"
     fi
 fi
 diff ${GIT_DIFF_OPTS-'-pu'} -L "a/$name1" -L "b/$name2" "$tmp1" "$tmp2"