mirror of
https://github.com/git/git.git
synced 2024-10-30 13:57:54 +01:00
f3999e0327
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 <bobbypowers@gmail.com>
Reviewed-by: René Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
19 lines
290 B
Bash
Executable file
19 lines
290 B
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='diff --no-index'
|
|
|
|
. ./test-lib.sh
|
|
|
|
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
|
|
'
|
|
|
|
test_done
|