undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

submodule update: remove unnecessary orig_flags variable

Browse Source 
cmd_update() in the submodule script tries to preserve the options given
on the command line in the "orig_flags" variable to pass them on into the
recursion when the '--recursive' option is given. But this isn't necessary
because all the variables set by the options will be seen in the recursion
too as that is achieved by executing "eval cmd_update".

The same has already been done for cmd_status() in e15bec0ec, so let's
clean up cmd_update() likewise. Also add a test to make sure that a
submodule name given on the command line is not passed into the recursion
(which was the goal of adding the orig_flags variable in 98dbe63db).

Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jens Lehmann 2013-11-11 21:55:52 +01:00 committed by Junio C Hamano
parent 0ecd94d7d7
commit 361412828a
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
git-submodule.sh
View File

@ -706,7 +706,6 @@ cmd_deinit()
cmd_update() cmd_update()
{ {
# parse $args after "submodule ... update". # parse $args after "submodule ... update".
orig_flags=
while test $# -ne 0 while test $# -ne 0
do do
case "$1" in case "$1" in
@ -731,7 +730,6 @@ cmd_update()
--reference) --reference)
case "$2" in '') usage ;; esac case "$2" in '') usage ;; esac
reference="--reference=$2" reference="--reference=$2"
orig_flags="$orig_flags $(git rev-parse --sq-quote "$1")"
shift shift
;; ;;
--reference=*) --reference=*)
@ -765,7 +763,6 @@ cmd_update()
break break
;; ;;
esac esac
orig_flags="$orig_flags $(git rev-parse --sq-quote "$1")"
shift shift
done done
@ -909,7 +906,7 @@ Maybe you want to use 'update --init'?")"
prefix="$prefix$sm_path/" prefix="$prefix$sm_path/"
clear_local_git_env clear_local_git_env
cd "$sm_path" && cd "$sm_path" &&
eval cmd_update "$orig_flags" eval cmd_update
) )
res=$? res=$?
if test $res -gt 0 if test $res -gt 0

11
t/t7406-submodule-update.sh
View File

@ -747,6 +747,17 @@ test_expect_success 'submodule update clone shallow submodule' '
(cd submodule && (cd submodule &&
test 1 = $(git log --oneline | wc -l) 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 test_done