diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-12-05 13:00:20 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-12-05 13:00:20 -0800 |
| commit | c83386d14ded4968c93098d9413425ab29eb38a0 (patch) | |
| tree | 14c64c285e5de9db9f0666953801f9064a948faf | |
| parent | Merge branch 'nd/wt-status-align-i18n' (diff) | |
| parent | submodule update: remove unnecessary orig_flags variable (diff) | |
| download | tgif-c83386d14ded4968c93098d9413425ab29eb38a0.tar.xz | |
Merge branch 'jl/submodule-update-retire-orig-flags'
Code clean-up.
* jl/submodule-update-retire-orig-flags:
submodule update: remove unnecessary orig_flags variable
| -rwxr-xr-x | git-submodule.sh | 5 | ||||
| -rwxr-xr-x | t/t7406-submodule-update.sh | 11 |
2 files changed, 12 insertions, 4 deletions
diff --git a/git-submodule.sh b/git-submodule.sh index ed02f03214..2677f2e8b3 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -721,7 +721,6 @@ cmd_deinit() cmd_update() { # parse $args after "submodule ... update". - orig_flags= while test $# -ne 0 do case "$1" in @@ -746,7 +745,6 @@ cmd_update() --reference) case "$2" in '') usage ;; esac reference="--reference=$2" - orig_flags="$orig_flags $(git rev-parse --sq-quote "$1")" shift ;; --reference=*) @@ -780,7 +778,6 @@ cmd_update() break ;; esac - orig_flags="$orig_flags $(git rev-parse --sq-quote "$1")" shift done @@ -924,7 +921,7 @@ Maybe you want to use 'update --init'?")" prefix="$prefix$sm_path/" clear_local_git_env cd "$sm_path" && - eval cmd_update "$orig_flags" + eval cmd_update ) res=$? if test $res -gt 0 diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh index 0825a928df..0246e80b1a 100755 --- a/t/t7406-submodule-update.sh +++ b/t/t7406-submodule-update.sh @@ -762,6 +762,17 @@ test_expect_success 'submodule update clone shallow submodule' ' (cd submodule && test 1 = $(git log --oneline | wc -l) ) +) +' + +test_expect_success 'submodule update --recursive drops module name before recursing' ' + (cd super2 && + (cd deeper/submodule/subsubmodule && + git checkout HEAD^ + ) && + git submodule update --recursive deeper/submodule >actual && + test_i18ngrep "Submodule path .deeper/submodule/subsubmodule.: checked out" actual ) ' + test_done |