diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-09-10 15:31:06 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-10 15:31:06 -0700 |
| commit | e3f26752b5e9d38e88a09671d124b61fb0cd5dbf (patch) | |
| tree | fb5b5d9bc1c17bb827d97e4896d66a40c42de1ff /t/t2107-update-index-basic.sh | |
| parent | 871e293c9acbeaacce59dcd98fab6028f552f5be (diff) | |
| parent | 9a8eea9604ade731c3d0ff10136f2ae81b2a13c8 (diff) | |
| download | git-e3f26752b5e9d38e88a09671d124b61fb0cd5dbf.tar.gz | |
Merge branch 'maint-1.7.11' into maint
* maint-1.7.11:
Almost 1.7.11.6
gitweb: URL-decode $my_url/$my_uri when stripping PATH_INFO
rebase -i: use full onto sha1 in reflog
sh-setup: protect from exported IFS
receive-pack: do not leak output from auto-gc to standard output
t/t5400: demonstrate breakage caused by informational message from prune
setup: clarify error messages for file/revisions ambiguity
send-email: improve RFC2047 quote parsing
fsck: detect null sha1 in tree entries
do not write null sha1s to on-disk index
diff: do not use null sha1 as a sentinel value
Diffstat (limited to 't/t2107-update-index-basic.sh')
| -rwxr-xr-x | t/t2107-update-index-basic.sh | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/t/t2107-update-index-basic.sh b/t/t2107-update-index-basic.sh index 809fafe208..0dbbb00d74 100755 --- a/t/t2107-update-index-basic.sh +++ b/t/t2107-update-index-basic.sh @@ -29,4 +29,23 @@ test_expect_success 'update-index -h with corrupt index' ' grep "[Uu]sage: git update-index" broken/usage ' +test_expect_success '--cacheinfo does not accept blob null sha1' ' + echo content >file && + git add file && + git rev-parse :file >expect && + test_must_fail git update-index --cacheinfo 100644 $_z40 file && + git rev-parse :file >actual && + test_cmp expect actual +' + +test_expect_success '--cacheinfo does not accept gitlink null sha1' ' + git init submodule && + (cd submodule && test_commit foo) && + git add submodule && + git rev-parse :submodule >expect && + test_must_fail git update-index --cacheinfo 160000 $_z40 submodule && + git rev-parse :submodule >actual && + test_cmp expect actual +' + test_done |