diff options
author | Glen Choo <chooglen@google.com> | 2022-03-05 01:13:59 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-03-05 01:39:12 +0100 |
commit | 97cb977c8243c3393a85d662456a1e161596f211 (patch) | |
tree | 412895f8cf7cf851f1d4230de37f18defe35de43 /git-submodule.sh | |
parent | submodule--helper update-clone: learn --init (diff) | |
download | git-97cb977c8243c3393a85d662456a1e161596f211.tar.xz git-97cb977c8243c3393a85d662456a1e161596f211.zip |
submodule--helper: remove ensure-core-worktree
Move the logic of "git submodule--helper ensure-core-worktree" into
run-update-procedure, and since this makes the ensure-core-worktree
command obsolete, remove it.
As a result, the order of two operations in git-submodule.sh is
reversed: 'set the value of core.worktree' now happens after the call to
"git submodule--helper relative-path". This is safe - "relative-path"
does not depend on the value of core.worktree.
Signed-off-by: Glen Choo <chooglen@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-submodule.sh')
-rwxr-xr-x | git-submodule.sh | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/git-submodule.sh b/git-submodule.sh index 16dea0ca59..51be7c7f7e 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -385,8 +385,6 @@ cmd_update() do die_if_unmatched "$quickabort" "$sha1" - git submodule--helper ensure-core-worktree "$sm_path" || exit 1 - displaypath=$(git submodule--helper relative-path "$prefix$sm_path" "$wt_prefix") if test $just_cloned -eq 0 |