Merge branch 'master' into next

* master:
  annotate-blame: tests incomplete lines.
  blame: unbreak "diff -U 0".

2 files changed, 21 insertions, 2 deletions

diff --git a/blame.c b/blame.c
index fca22f9000..90338af31c 100644
--- a/blame.c
+++ b/blame.c
@@ -92,7 +92,7 @@ static struct patch *get_patch(struct commit *commit, struct commit *other)
 		die("write failed: %s", strerror(errno));
 	close(fd);
 
-	sprintf(diff_cmd, "diff -u -U 0 %s %s", tmp_path1, tmp_path2);
+	sprintf(diff_cmd, "diff -U 0 %s %s", tmp_path1, tmp_path2);
 	fin = popen(diff_cmd, "r");
 	if (!fin)
 		die("popen failed: %s", strerror(errno));
@@ -234,7 +234,7 @@ static void print_patch(struct patch *p)
 	}
 }
 
-#if 0
+#if DEBUG
 /* For debugging only */
 static void print_map(struct commit *cmit, struct commit *other)
 {
diff --git a/t/annotate-tests.sh b/t/annotate-tests.sh
index 8cb32e156b..9c5a15a15e 100644
--- a/t/annotate-tests.sh
+++ b/t/annotate-tests.sh
@@ -100,3 +100,22 @@ test_expect_success \
     'Two lines blamed on A, one on B, two on B1, one on B2, one on A U Thor' \
     'check_count A 2 B 1 B1 2 B2 1 "A U Thor" 1'
 
+test_expect_success \
+    'an incomplete line added' \
+    'echo "incomplete" | tr -d "\\012" >>file &&
+    GIT_AUTHOR_NAME="C" git commit -a -m "Incomplete"'
+
+test_expect_success \
+    'With incomplete lines.' \
+    'check_count A 2 B 1 B1 2 B2 1 "A U Thor" 1 C 1'
+
+test_expect_success \
+    'some edit' \
+    'mv file file1 &&
+     sed -e 1d -e "5s/3A/99/" file1 >file &&
+     rm -f file1 &&
+    GIT_AUTHOR_NAME="D" git commit -a -m "edit"'
+
+test_expect_success \
+    'some edit' \
+    'check_count A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1'