summaryrefslogtreecommitdiff
path: root/git-mergetool--lib.sh
diff options
context:
space:
mode:
authorLibravatar Johan Herland <johan@herland.net>2010-02-16 11:21:14 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-02-17 11:14:04 -0800
commit3deea89c5feb0dfdfb99ea752f83497d97a3bdd5 (patch)
treed44dac620a12cedcc1e8c73724b166ff35423a78 /git-mergetool--lib.sh
parentGit 1.7.0 (diff)
downloadtgif-3deea89c5feb0dfdfb99ea752f83497d97a3bdd5.tar.xz
submodule summary: Don't barf when invoked in an empty repo
When invoking "git submodule summary" in an empty repo (which can be indirectly done by setting status.submodulesummary = true), it currently emits an error message (via "git diff-index") since HEAD points to an unborn branch. This patch adds handling of the HEAD-points-to-unborn-branch special case, so that "git submodule summary" no longer emits this error message. The patch also adds a test case that verifies the fix. Suggested-by: Jeff King <peff@peff.net> Signed-off-by: Johan Herland <johan@herland.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-mergetool--lib.sh')
0 files changed, 0 insertions, 0 deletions