From 052b2551adf308e663dbb3fda9ab0347e18dd42b Mon Sep 17 00:00:00 2001 From: Eric Sunshine Date: Wed, 24 Dec 2014 04:43:15 -0500 Subject: [PATCH] t2004: demonstrate broken relative path printing checkout-index --temp only properly prints relative paths which are descendants of the current directory. Paths in ancestor or sibling directories (or their children) are often printed in mangled form. For example: mkdir a bbb && >file && >bbb/file && git update-index --add file bbb/file && cd a && git checkout-index --temp ../file ../bbb/file prints: .merge_file_ooblek le .merge_file_igloo0 b/file rather than the correct: .merge_file_ooblek ../file .merge_file_igloo0 ../bbb/file Unfortunately, testing is complicated slightly by relative paths sometimes _appearing_ to be printed correctly, but this is an accident of implementation in which a "correct" copy of the string exists in memory beyond the end of the real string, and that "correct" copy gets printed. This test takes care to avoid the accidentally "correct" behavior by testing with a filename longer than the directory name in which checkout-index is invoked. Signed-off-by: Eric Sunshine Signed-off-by: Junio C Hamano --- t/t2004-checkout-cache-temp.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/t/t2004-checkout-cache-temp.sh b/t/t2004-checkout-cache-temp.sh index 602fbc753c..3c2b2b9046 100755 --- a/t/t2004-checkout-cache-temp.sh +++ b/t/t2004-checkout-cache-temp.sh @@ -206,4 +206,16 @@ test_expect_success 'checkout --temp symlink' ' test $(cat $p) = path7 ' +test_expect_failure 'emit well-formed relative path' ' + rm -f path* .merge_* actual .git/index && + >path0123456789 && + git update-index --add path0123456789 && + ( + cd asubdir && + git checkout-index --temp -- ../path0123456789 >actual && + test_line_count = 1 actual && + test $(cut "-d " -f2 actual) = ../path0123456789 + ) +' + test_done -- 2.43.2