diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-09-25 15:24:06 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-09-25 15:24:07 +0900 |
commit | ceb7a01aac907f124ca9bc0d768336e7c0aaa944 (patch) | |
tree | 572653023abd76faf00323f0862a6054a6f319e8 /t | |
parent | c50424a6f07f17ff9b06927606df650cd73a09a3 (diff) | |
parent | 006f3f28af2afb8c567ef3ddf4f0a9110c6be437 (diff) | |
download | git-ceb7a01aac907f124ca9bc0d768336e7c0aaa944.tar.gz git-ceb7a01aac907f124ca9bc0d768336e7c0aaa944.tar.xz |
Merge branch 'jn/per-repo-object-store-fixes'
Step #0 of a planned & larger series to make the in-core object
store per in-core repository object.
* jn/per-repo-object-store-fixes:
replace-objects: evaluate replacement refs without using the object store
push, fetch: error out for submodule entries not pointing to commits
pack: make packed_git_mru global a value instead of a pointer
Diffstat (limited to 't')
-rwxr-xr-x | t/t5531-deep-submodule-push.sh | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/t/t5531-deep-submodule-push.sh b/t/t5531-deep-submodule-push.sh index 0f84a5314..39cb2c1c3 100755 --- a/t/t5531-deep-submodule-push.sh +++ b/t/t5531-deep-submodule-push.sh @@ -298,6 +298,16 @@ test_expect_success 'push succeeds if submodule commit disabling recursion from ) ' +test_expect_success 'submodule entry pointing at a tag is error' ' + git -C work/gar/bage tag -a test1 -m "tag" && + tag=$(git -C work/gar/bage rev-parse test1^{tag}) && + git -C work update-index --cacheinfo 160000 "$tag" gar/bage && + git -C work commit -m "bad commit" && + test_when_finished "git -C work reset --hard HEAD^" && + test_must_fail git -C work push --recurse-submodules=on-demand ../pub.git master 2>err && + test_i18ngrep "is a tag, not a commit" err +' + test_expect_success 'push fails if recurse submodules option passed as yes' ' ( cd work/gar/bage && |