Fix "quote" misconversion for rewrite diff output.
authorJunio C Hamano <gitster@pobox.com>
Thu, 22 Nov 2007 07:06:44 +0000 (23:06 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 22 Nov 2007 07:06:44 +0000 (23:06 -0800)
663af3422a648e87945e4d8c0cc3e13671f2bbde (Full rework of
quote_c_style and write_name_quoted.) mistakenly used puts()
when writing out a fixed string when it did not want to add a
terminating LF.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff.c
t/t4022-diff-rewrite.sh [new file with mode: 0755]

diff --git a/diff.c b/diff.c
index b08d28a..6b54959 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -2716,7 +2716,7 @@ static void diff_summary(struct diff_filepair *p)
                break;
        default:
                if (p->score) {
                break;
        default:
                if (p->score) {
-                       puts(" rewrite ");
+                       fputs(" rewrite ", stdout);
                        write_name_quoted(p->two->path, stdout, ' ');
                        printf("(%d%%)\n", similarity_index(p));
                }
                        write_name_quoted(p->two->path, stdout, ' ');
                        printf("(%d%%)\n", similarity_index(p));
                }
diff --git a/t/t4022-diff-rewrite.sh b/t/t4022-diff-rewrite.sh
new file mode 100755 (executable)
index 0000000..6de4acb
--- /dev/null
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+test_description='rewrite diff'
+
+. ./test-lib.sh
+
+test_expect_success setup '
+
+       cat ../../COPYING >test &&
+       git add test &&
+       tr 'a-zA-Z' 'n-za-mN-ZA-M' <../../COPYING >test
+
+'
+
+test_expect_success 'detect rewrite' '
+
+       actual=$(git diff-files -B --summary test) &&
+       expr "$actual" : " rewrite test ([0-9]*%)$" || {
+               echo "Eh? <<$actual>>"
+               false
+       }
+
+'
+
+test_done
+