diff options
| author | Bobby Powers <bobbypowers@gmail.com> | 2012-05-16 14:28:31 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-16 18:17:45 (GMT) |
| commit | f3999e03274df6b98a98a32912f5e171d6eea35f (patch) | |
| tree | c21765c600169d55d4bdec7fdd869f60beb22b2f /t/t4053-diff-no-index.sh | |
| parent | 875b91b35d2517773495e8404f31fde8c5cbd27d (diff) | |
| download | git-f3999e03274df6b98a98a32912f5e171d6eea35f.zip git-f3999e03274df6b98a98a32912f5e171d6eea35f.tar.gz git-f3999e03274df6b98a98a32912f5e171d6eea35f.tar.bz2 | |
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 <bobbypowers@gmail.com>
Reviewed-by: René Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4053-diff-no-index.sh')
| -rwxr-xr-x | t/t4053-diff-no-index.sh | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/t/t4053-diff-no-index.sh b/t/t4053-diff-no-index.sh new file mode 100755 index 0000000..4dc8c67 --- /dev/null +++ b/t/t4053-diff-no-index.sh @@ -0,0 +1,19 @@ +#!/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 |