File tree Expand file tree Collapse file tree 2 files changed +12
-4
lines changed Expand file tree Collapse file tree 2 files changed +12
-4
lines changed Original file line number Diff line number Diff line change @@ -721,7 +721,6 @@ cmd_deinit()
721
721
cmd_update ()
722
722
{
723
723
# parse $args after "submodule ... update".
724
- orig_flags=
725
724
while test $# -ne 0
726
725
do
727
726
case " $1 " in
@@ -746,7 +745,6 @@ cmd_update()
746
745
--reference)
747
746
case " $2 " in ' ' ) usage ;; esac
748
747
reference=" --reference=$2 "
749
- orig_flags=" $orig_flags $( git rev-parse --sq-quote " $1 " ) "
750
748
shift
751
749
;;
752
750
--reference=* )
@@ -780,7 +778,6 @@ cmd_update()
780
778
break
781
779
;;
782
780
esac
783
- orig_flags=" $orig_flags $( git rev-parse --sq-quote " $1 " ) "
784
781
shift
785
782
done
786
783
@@ -924,7 +921,7 @@ Maybe you want to use 'update --init'?")"
924
921
prefix=" $prefix$sm_path /"
925
922
clear_local_git_env
926
923
cd " $sm_path " &&
927
- eval cmd_update " $orig_flags "
924
+ eval cmd_update
928
925
)
929
926
res=$?
930
927
if test $res -gt 0
Original file line number Diff line number Diff line change @@ -762,6 +762,17 @@ test_expect_success 'submodule update clone shallow submodule' '
762
762
(cd submodule &&
763
763
test 1 = $(git log --oneline | wc -l)
764
764
)
765
+ )
766
+ '
767
+
768
+ test_expect_success ' submodule update --recursive drops module name before recursing' '
769
+ (cd super2 &&
770
+ (cd deeper/submodule/subsubmodule &&
771
+ git checkout HEAD^
772
+ ) &&
773
+ git submodule update --recursive deeper/submodule >actual &&
774
+ test_i18ngrep "Submodule path .deeper/submodule/subsubmodule.: checked out" actual
765
775
)
766
776
'
777
+
767
778
test_done
You can’t perform that action at this time.
0 commit comments