diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-01-14 10:09:47 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-01-14 10:09:47 +0300 |
commit | 132d04b565d20ebc50ba6dd34bf6a9913bbbe6a1 (patch) | |
tree | 798f859a66bc5d43b2e531e8730b770d16cc516a /t | |
parent | 4d8e6e1d7967206826edcfa2c70d262336926f56 (diff) | |
parent | 2ce53f9b77eb36c6d1286f55fba65f8dc66b2564 (diff) |
Merge branch 'js/add-not-submodule'
* js/add-not-submodule:
git add: do not add files from a submodule
Diffstat (limited to 't')
-rwxr-xr-x | t/t7400-submodule-basic.sh | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh index be73f7b60a..2ec7ac6a51 100755 --- a/t/t7400-submodule-basic.sh +++ b/t/t7400-submodule-basic.sh @@ -209,4 +209,29 @@ test_expect_success 'update --init' ' ' +test_expect_success 'do not add files from a submodule' ' + + git reset --hard && + test_must_fail git add init/a + +' + +test_expect_success 'gracefully add submodule with a trailing slash' ' + + git reset --hard && + git commit -m "commit subproject" init && + (cd init && + echo b > a) && + git add init/ && + git diff --exit-code --cached init && + commit=$(cd init && + git commit -m update a >/dev/null && + git rev-parse HEAD) && + git add init/ && + test_must_fail git diff --exit-code --cached init && + test $commit = $(git ls-files --stage | + sed -n "s/^160000 \([^ ]*\).*/\1/p") + +' + test_done |