summaryrefslogtreecommitdiff
path: root/git-gui/macosx/git-gui.icns
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-12-02 13:31:55 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-12-02 13:48:06 -0800
commitac1fbbda2013416b6c6a93d65c5dcf6662a60579 (patch)
tree29202f37d2eb45ca3df630f6cc7d58c4e7e77340 /git-gui/macosx/git-gui.icns
parentremote-hg: don't decode UTF-8 paths into Unicode objects (diff)
downloadtgif-ac1fbbda2013416b6c6a93d65c5dcf6662a60579.tar.xz
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>
Diffstat (limited to 'git-gui/macosx/git-gui.icns')
0 files changed, 0 insertions, 0 deletions