projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 5e4f614) | patch
fmt-merge-msg: be quiet if nothing to merge
authorStephen Boyd <bebarino@gmail.com>
Wed, 24 Mar 2010 07:15:58 +0000 (00:15 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 25 Mar 2010 02:39:40 +0000 (19:39 -0700)
commit419fe5bc861517c789c8f028519e085fd8d1992f
treedfbdaf404cfbfc3c70218e5639aca663d87ea95ctree | snapshot
parent5e4f61474202122f376b16181b760f390623bf4ecommit | diff
fmt-merge-msg: be quiet if nothing to merge

When FETCH_HEAD contains only 'not-for-merge' entries fmt-merge-msg
still outputs "Merge" (and if the branch isn't master " into <branch>").
In this case fmt-merge-msg is outputting junk and should really just
be quiet. Fix it.

Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/fmt-merge-msg.c diff | blob | history
t/t6200-fmt-merge-msg.sh diff | blob | history
Git—the stupid content tracker