diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-02-06 22:05:25 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-02-06 22:05:25 -0800 |
| commit | e524e44ecad731352102e85226daef61268494c6 (patch) | |
| tree | 296b9bde9f09fd77adb0e1e5e03df27c7e0399dd | |
| parent | 51b996662bb5ac055cf9639eb0f0a1fc5876a4aa (diff) | |
| parent | 5d124f419d1e9b7d22fae915627de7e463bf7c42 (diff) | |
| download | git-e524e44ecad731352102e85226daef61268494c6.tar.xz | |
Merge branch 'sb/submodule-abort-update-upon-config-failure'
"git submodule update" learned to abort early when core.worktree
for the submodule is not set correctly to prevent spreading damage.
* sb/submodule-abort-update-upon-config-failure:
git-submodule: abort if core.worktree could not be set correctly
| -rwxr-xr-x | git-submodule.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-submodule.sh b/git-submodule.sh index 5e608f8bad..02a0d72817 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -548,7 +548,7 @@ cmd_update() do die_if_unmatched "$quickabort" "$sha1" - git submodule--helper ensure-core-worktree "$sm_path" + git submodule--helper ensure-core-worktree "$sm_path" || exit 1 update_module=$(git submodule--helper update-module-mode $just_cloned "$sm_path" $update) |