diff options
| author |  Stephen Boyd <bebarino@gmail.com> | 2010-03-24 00:15:58 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-03-24 19:39:40 -0700 |
| commit | 419fe5bc861517c789c8f028519e085fd8d1992f (patch) | |
| tree | dfbdaf404cfbfc3c70218e5639aca663d87ea95c /builtin/fmt-merge-msg.c | |
| parent | Merge branch 'jh/maint-submodule-status-in-void' (diff) | |
| download | tgif-419fe5bc861517c789c8f028519e085fd8d1992f.tar.xz | |
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>
Diffstat (limited to 'builtin/fmt-merge-msg.c')
| -rw-r--r-- | builtin/fmt-merge-msg.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c index 9d524000b5..9bb26255e0 100644 --- a/builtin/fmt-merge-msg.c +++ b/builtin/fmt-merge-msg.c @@ -281,6 +281,9 @@ int fmt_merge_msg(int merge_summary, struct strbuf *in, struct strbuf *out) { die ("Error in line %d: %.*s", i, len, p); } + if (!srcs.nr) + return 0; + strbuf_addstr(out, "Merge "); for (i = 0; i < srcs.nr; i++) { struct src_data *src_data = srcs.payload[i]; |