diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-07-22 13:01:56 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-07-22 13:01:56 -0700 |
commit | 1cd2913960f752508c3f529dbccd359ed79a1a9f (patch) | |
tree | 590510ec0e0d3c18129ee47bbabdfebea7b8ddfc /t | |
parent | 1f5881d3fcfd8e2cc69ebd96f24d5db797795844 (diff) | |
parent | d5f53338ab2ee29c588f46d5cb28d7e3b25018f2 (diff) | |
download | git-1cd2913960f752508c3f529dbccd359ed79a1a9f.tar.gz git-1cd2913960f752508c3f529dbccd359ed79a1a9f.tar.xz |
Merge branch 'tg/maint-cache-name-compare' into maint
Even though the index can record pathnames longer than 1<<12 bytes,
in some places we were not comparing them in full, potentially
replacing index entries instead of adding.
* tg/maint-cache-name-compare:
cache_name_compare(): do not truncate while comparing paths
Diffstat (limited to 't')
-rwxr-xr-x | t/t3006-ls-files-long.sh | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/t/t3006-ls-files-long.sh b/t/t3006-ls-files-long.sh new file mode 100755 index 000000000..202ad658b --- /dev/null +++ b/t/t3006-ls-files-long.sh @@ -0,0 +1,39 @@ +#!/bin/sh + +test_description='overly long paths' +. ./test-lib.sh + +test_expect_success setup ' + p=filefilefilefilefilefilefilefile && + p=$p$p$p$p$p$p$p$p$p$p$p$p$p$p$p$p && + p=$p$p$p$p$p$p$p$p$p$p$p$p$p$p$p$p && + + path_a=${p}_a && + path_z=${p}_z && + + blob_a=$(echo frotz | git hash-object -w --stdin) && + blob_z=$(echo nitfol | git hash-object -w --stdin) && + + pat="100644 %s 0\t%s\n" +' + +test_expect_success 'overly-long path by itself is not a problem' ' + printf "$pat" "$blob_a" "$path_a" | + git update-index --add --index-info && + echo "$path_a" >expect && + git ls-files >actual && + test_cmp expect actual +' + +test_expect_success 'overly-long path does not replace another by mistake' ' + printf "$pat" "$blob_a" "$path_a" "$blob_z" "$path_z" | + git update-index --add --index-info && + ( + echo "$path_a" + echo "$path_z" + ) >expect && + git ls-files >actual && + test_cmp expect actual +' + +test_done |