mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fmt-merge-msg: be quiet if nothing to merge

Browse Source 
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>
This commit is contained in:
Stephen Boyd
2010-03-24 00:15:58 -07:00
committed by Junio C Hamano
parent 5e4f614742
commit 419fe5bc86
2 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
builtin/fmt-merge-msg.c
View File

@ -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); die ("Error in line %d: %.*s", i, len, p);
} }
if (!srcs.nr)
return 0;
strbuf_addstr(out, "Merge "); strbuf_addstr(out, "Merge ");
for (i = 0; i < srcs.nr; i++) { for (i = 0; i < srcs.nr; i++) {
struct src_data *src_data = srcs.payload[i]; struct src_data *src_data = srcs.payload[i];

19
t/t6200-fmt-merge-msg.sh
View File

@ -21,6 +21,8 @@ test_expect_success setup '
setdate && setdate &&
git commit -m "Initial" && git commit -m "Initial" &&
git clone . remote &&
echo uno >one && echo uno >one &&
echo dos >two && echo dos >two &&
git add two && git add two &&
@ -240,4 +242,21 @@ test_expect_success 'merge-msg -F in subdirectory' '
test_cmp expected actual test_cmp expected actual
' '
test_expect_success 'merge-msg with nothing to merge' '
git config --unset-all merge.log
git config --unset-all merge.summary
git config merge.summary yes &&
(
cd remote &&
git checkout -b unrelated &&
setdate &&
git fetch origin &&
git fmt-merge-msg <.git/FETCH_HEAD >../actual
) &&
test_cmp /dev/null actual
'
test_done test_done