Please sign in to comment.
diff --no-index: reset temporary buffer lengths on directory iteration
Commit 875b91b (diff --no-index: use strbuf for temporary pathnames, 2012-04-25) introduced a regression when using diff --no-index with directories. When iterating through a directory, the switch to strbuf from heap-allocated char arrays caused paths to form like 'dir/file1', 'dir/file1file2', rather than 'dir/file1', 'dir/file2' as expected. Avoid this by resetting the paths variables to their original length before each iteration. Signed-off-by: Bobby Powers <email@example.com> Reviewed-by: René Scharfe <firstname.lastname@example.org> Signed-off-by: Junio C Hamano <email@example.com>
- Loading branch information...
Showing with 25 additions and 0 deletions.
|@@ -0,0 +1,19 @@|
|test_expect_success 'setup' '|
|mkdir a &&|
|mkdir b &&|
|echo 1 >a/1 &&|
|echo 2 >a/2|
|test_expect_success 'git diff --no-index directories' '|
|git diff --no-index a b >cnt|
|test $? = 1 && test_line_count = 14 cnt|