diff --no-index: reset temporary buffer lengths on directory iteration
authorBobby Powers <bobbypowers@gmail.com>
Wed, 16 May 2012 14:28:31 +0000 (10:28 -0400)
committerJunio C Hamano <gitster@pobox.com>
Wed, 16 May 2012 18:17:45 +0000 (11:17 -0700)
commitf3999e03274df6b98a98a32912f5e171d6eea35f
treec21765c600169d55d4bdec7fdd869f60beb22b2f
parent875b91b35d2517773495e8404f31fde8c5cbd27d
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>
diff-no-index.c
t/t4053-diff-no-index.sh [new file with mode: 0755]