diff options
| author | Fredrik Gustafsson <iveqy@iveqy.com> | 2011-08-15 23:17:46 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-16 11:04:31 -0700 |
| commit | abc06822af57347d35c0cd64b67e1faeb5b65c71 (patch) | |
| tree | 6a6484a355e2e5b0a8b7b839c0e3ea6b1bd67457 /t/t7400-submodule-basic.sh | |
| parent | e7a85be3cfc4ee017f59f1d1f8ceb63d7c88c9c8 (diff) | |
| download | git-abc06822af57347d35c0cd64b67e1faeb5b65c71.tar.gz git-abc06822af57347d35c0cd64b67e1faeb5b65c71.tar.xz | |
rev-parse: add option --resolve-git-dir <path>
Check if <path> is a valid git-dir or a valid git-file that points
to a valid git-dir.
We want tests to be independent from the fact that a git-dir may
be a git-file. Thus we changed tests to use this feature.
Signed-off-by: Fredrik Gustafsson <iveqy@iveqy.com>
Mentored-by: Jens Lehmann <Jens.Lehmann@web.de>
Mentored-by: Heiko Voigt <hvoigt@hvoigt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7400-submodule-basic.sh')
| -rwxr-xr-x | t/t7400-submodule-basic.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh index 14dc92723..270a7d5b8 100755 --- a/t/t7400-submodule-basic.sh +++ b/t/t7400-submodule-basic.sh @@ -360,10 +360,10 @@ test_expect_success 'update --init' ' git submodule update init > update.out && cat update.out && test_i18ngrep "not initialized" update.out && - ! test -d init/.git && + test_must_fail git rev-parse --resolve-git-dir init/.git && git submodule update --init init && - test -d init/.git + git rev-parse --resolve-git-dir init/.git ' test_expect_success 'do not add files from a submodule' ' |