mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

submodule--helper update-clone: abort gracefully on missing .gitmodules

Browse Source 
When there is no .gitmodules file availabe to initialize a submodule
from, `submodule_from_path` just returns NULL. We need to check for
that and abort gracefully.

When `git submodule update` was implemented in shell, this error out
with the warning

    Submodule path '%s' not initialized
    Maybe you want to use 'update --init'?

Replicate that behavior for now instead of crashing.

Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Stefan Beller
2016-04-28 13:02:46 -07:00
committed by Junio C Hamano
parent d92028a575
commit 08fdbdb153
2 changed files with 33 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
t/t7400-submodule-basic.sh
View File

@ -26,6 +26,14 @@ test_expect_success 'submodule init aborts on missing .gitmodules file' '
test_i18ngrep "No url found for submodule path" actual
'
test_expect_success 'submodule update aborts on missing .gitmodules file' '
test_when_finished "git update-index --remove sub" &&
git update-index --add --cacheinfo 160000,$(git rev-parse HEAD),sub &&
# missing the .gitmodules file here
git submodule update sub 2>actual &&
test_i18ngrep "Submodule path .sub. not initialized" actual
'
test_expect_success 'configuration parsing' '
test_when_finished "rm -f .gitmodules" &&
cat >.gitmodules <<-\EOF &&