summaryrefslogtreecommitdiff
path: root/t/t5402-post-merge-hook.sh
diff options
context:
space:
mode:
authorLibravatar Bobby Powers <bobbypowers@gmail.com>2012-05-16 10:28:31 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-05-16 11:17:45 -0700
commitf3999e03274df6b98a98a32912f5e171d6eea35f (patch)
treec21765c600169d55d4bdec7fdd869f60beb22b2f /t/t5402-post-merge-hook.sh
parentdiff --no-index: use strbuf for temporary pathnames (diff)
downloadtgif-f3999e03274df6b98a98a32912f5e171d6eea35f.tar.xz
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/t5402-post-merge-hook.sh')
0 files changed, 0 insertions, 0 deletions