submodule.c: uninitialized submodules are ignored in recursive commands
This was an oversight when working on the working tree modifying commands recursing into submodules. To test for uninitialized submodules, introduce another submodule "uninitialized_sub". Adding it via `submodule add` will activate the submodule in the preparation area (in create_lib_submodule_repo we setup all the things in submodule_update_repo), but the later tests will use a new testing repo that clones the preparation repo in which the new submodule is not initialized. By adding it to the branch "add_sub1", which is the starting point of all other branches, we have wide coverage. Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Stefan Beller committed
Apr 18, 2017 at 14:37 UTC
823bab09c68b4048e433ab48b9185302c2f4b63a
2 files changed
+4
submodule.c
+3
@@ -1333,6 +1333,9 @@ int submodule_move_head(const char *path,
1333
struct child_process cp = CHILD_PROCESS_INIT;
1334
const struct submodule *sub;
1335
1336
+ if (!is_submodule_initialized(path))
1337
+ return 0;
1338
+
1339
sub = submodule_from_path(null_sha1, path);
1340
1341
if (!sub)
t/lib-submodule-update.sh
+1
@@ -73,6 +73,7 @@ create_lib_submodule_repo () {
73
74
git checkout -b "add_sub1" &&
75
git submodule add ../submodule_update_sub1 sub1 &&
76
+ git submodule add ../submodule_update_sub1 uninitialized_sub &&
77
git config -f .gitmodules submodule.sub1.ignore all &&
78
git config submodule.sub1.ignore all &&
79
git add .gitmodules &&