threads / patch / 30280

patchsequencer: remove additional blank line

Subject: [PATCH] sequencer: remove additional blank line

## tl;dr

2 messages between Apr 18, 2012 and Apr 19, 2012. Diffs are folded; open one to read it.

replies: 1people: 2as markdown or json

Ralf Thielow· Apr 18, 2012, 21:07 UTC · lore

Remove an additional blank line between the headline and the list of conflicted files after doing a recursive merge.

Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com>
---
Normally, the list of conflicted files come directly after
the headline like this

    Conflicts:
        folder/file
	...

Without this patch it would looks like this:

    Conflicts:

        folder/file
	...

 sequencer.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Show changes to sequencer.c +1 −1

diff --git a/sequencer.c b/sequencer.c
index a37846a..f6e44b8 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -234,7 +234,7 @@ static int do_recursive_merge(struct commit *base, struct commit *next,
 
 	if (!clean) {
 		int i;
-		strbuf_addstr(msgbuf, "\nConflicts:\n\n");
+		strbuf_addstr(msgbuf, "\nConflicts:\n");
 		for (i = 0; i < active_nr;) {
 			struct cache_entry *ce = active_cache[i++];
 			if (ce_stage(ce)) {

-- 
1.7.10.170.gac579

Junio C Hamano· Apr 19, 2012, 22:38 UTC · re: Ralf Thielow · lore

Re: [PATCH] sequencer: remove additional blank line

Ralf Thielow <ralf.thielow@googlemail.com> writes:

Show 12 quoted lines

> Remove an additional blank line between the
> headline and the list of conflicted files after
> doing a recursive merge.
>
> Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com>
> ---
> Normally, the list of conflicted files come directly after
> the headline like this
>
>     Conflicts:
>         folder/file
> 	...

Hrm.

A funny thing is that your "Normally" is a misconception caused by a regression in 1c7b76be (Build in merge, Jul 7, 2008). Before that change, this message was "Conflicts:" followed by an empty line and it was consistently so between "merge" and "cherry-pick", but the C rewrite of "git merge" broke it.

I do not care deeply either way; unifying them again to use one less line is probably fine.