undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into next

Browse Source 
* master:
  annotate-blame: tests incomplete lines.
  blame: unbreak "diff -U 0".
This commit is contained in:
Junio C Hamano 2006-03-06 00:41:47 -08:00
commit 806b8198cd
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
blame.c
View File

@ -92,7 +92,7 @@ static struct patch *get_patch(struct commit *commit, struct commit *other)
die("write failed: %s", strerror(errno)); die("write failed: %s", strerror(errno));
close(fd); 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"); fin = popen(diff_cmd, "r");
if (!fin) if (!fin)
die("popen failed: %s", strerror(errno)); die("popen failed: %s", strerror(errno));
@ -234,7 +234,7 @@ static void print_patch(struct patch *p)
} }
} }
#if 0 #if DEBUG
/* For debugging only */ /* For debugging only */
static void print_map(struct commit *cmit, struct commit *other) static void print_map(struct commit *cmit, struct commit *other)
{ {

19
t/annotate-tests.sh
View File

@ -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' \ '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' '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'