summaryrefslogtreecommitdiff
path: root/git-mergetool.sh
diff options
context:
space:
mode:
authorLibravatar Kevin Ballard <kevin@sb.org>2010-11-02 23:26:25 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-11-03 12:51:28 -0700
commit98dbe63dbcb44218e23ccc92e1491c36b2e31945 (patch)
tree406d5c2418aaa768e986c18f351888fcc168ab75 /git-mergetool.sh
parentsubmodule: preserve all arguments exactly when recursing (diff)
downloadtgif-98dbe63dbcb44218e23ccc92e1491c36b2e31945.tar.xz
submodule: only preserve flags across recursive status/update invocations
Recursive invocations of submodule update/status preserve all arguments, so executing git submodule update --recursive -- foo attempts to recursively update a submodule named "foo". Naturally, this fails as one cannot have an infinitely-deep stack of submodules each containing a submodule named "foo". The desired behavior is instead to update foo and then recursively update all submodules inside of foo. This commit accomplishes that by only saving the flags for use in the recursive invocation. Signed-off-by: Kevin Ballard <kevin@sb.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions