@matheusbsbs / matheus-bagliano / commits / ac1fbbda20

submodule: do not copy unknown update mode from .gitmodules

When submodule.$name.update is given as hint from the upstream in the .gitmodules file, we used to blindly copy it to .git/config, unless there already is a value defined for the submodule. However, there is no reason to expect that the update mode hinted by the upstream is available in the version of Git the user is using, and a really custom "!cmd" prepared by an upstream person running on Linux may not even be available to a user on Windows. It is simply irresponsible to copy the setting blindly and to attempt to use it during a later "submodule update" without validating it first. Just show the suggested value to the diagnostic output, and set the value to 'none' in the configuration, if it is not one of the ones that are known to be supported by this version of Git. Helped-by: Jens Lehmann <Jens.Lehmann@web.de> Helped-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Junio C Hamano committed Dec 2, 2013 at 13:31 UTC ac1fbbda2013416b6c6a93d65c5dcf6662a60579
2 files changed +30 -5
git-submodule.sh
+15 -5
@@ -612,11 +612,21 @@ cmd_init()
612 fi
613
614 # Copy "update" setting when it is not set yet
615 - upd="$(git config -f .gitmodules submodule."$name".update)"
616 - test -z "$upd" ||
617 - test -n "$(git config submodule."$name".update)" ||
618 - git config submodule."$name".update "$upd" ||
619 - die "$(eval_gettext "Failed to register update mode for submodule path '\$displaypath'")"
615 + if upd="$(git config -f .gitmodules submodule."$name".update)" &&
616 + test -n "$upd" &&
617 + test -z "$(git config submodule."$name".update)"
618 + then
619 + case "$upd" in
620 + rebase | merge | none)
621 + ;; # known modes of updating
622 + *)
623 + echo >&2 "warning: unknown update mode '$upd' suggested for submodule '$name'"
624 + upd=none
625 + ;;
626 + esac
627 + git config submodule."$name".update "$upd" ||
628 + die "$(eval_gettext "Failed to register update mode for submodule path '\$displaypath'")"
629 + fi
630 done
631 }
632
t/t7406-submodule-update.sh
+15
@@ -323,6 +323,21 @@ test_expect_success 'submodule update - command in .git/config catches failure'
323 )
324 '
325
326 +test_expect_success 'submodule init does not copy command into .git/config' '
327 + (cd super &&
328 + H=$(git ls-files -s submodule | cut -d" " -f2) &&
329 + mkdir submodule1 &&
330 + git update-index --add --cacheinfo 160000 $H submodule1 &&
331 + git config -f .gitmodules submodule.submodule1.path submodule1 &&
332 + git config -f .gitmodules submodule.submodule1.url ../submodule &&
333 + git config -f .gitmodules submodule.submodule1.update !false &&
334 + git submodule init submodule1 &&
335 + echo "none" >expect &&
336 + git config submodule.submodule1.update >actual &&
337 + test_cmp expect actual
338 + )
339 +'
340 +
341 test_expect_success 'submodule init picks up rebase' '
342 (cd super &&
343 git config -f .gitmodules submodule.rebasing.update rebase &&