Re: [PATCH] "master" should be treated no differently from any other branch

Andy Parkins [off-list ref] writes:

On Thursday 2006, December 14 20:41, Junio C Hamano wrote:

quoted

However, the fmt-merge-message was designed so for a very
practical reason --- to keep Merge commit log messages Linus
makes in the kernel repository short and readable.

I'm only after consistency; how about the reverse solution: drop the "into" 
completely?

I guess that question indicates that the part of my message you
did not quote was not written cleanly enough.

Shawn Pearce wrote:

Andy Parkins [off-list ref] wrote:

quoted

On Thursday 2006, December 14 21:30, Junio C Hamano wrote:

quoted

I guess that question indicates that the part of my message you
did not quote was not written cleanly enough.

It was; I'm just stupid.

Let's make the special case "linux-master" and then Linus gets what he wants 
and consistency is restored.

No?  Okay, I give up then. :-)

What about we do instead:

      [branch]
              mergeMessageTemplate = "Merge '%(remoteref)' from '%(remoteurl)' into '%(localref)'
%(summary)"
      [branch "master"]
              mergeMessageTemplate = "Merge '%(remoteref)' from '%(remoteurl)'
%(summary)"

I disagree about '%(summary)' part, as it is controlled by merge.summary
configuration variable. If you want per branch configuration, why not
branch.<branchname>.mergesummary?

By the way, the above ignores the fact, that besides having hardcoded
that we don't say "into master", we have _two_ merge subject templates:
one for merging from remote, one for merging from local. We might not
have %(remoteurl), then what?

-- 
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git

On Thursday 2006, December 14 21:30, Junio C Hamano wrote:

I guess that question indicates that the part of my message you
did not quote was not written cleanly enough.

It was; I'm just stupid.

Let's make the special case "linux-master" and then Linus gets what he wants 
and consistency is restored.

No?  Okay, I give up then. :-)


Andy

-- 
Dr Andrew Parkins, M Eng (Hons), AMIEE

Andy Parkins [off-list ref] wrote:

On Thursday 2006, December 14 21:30, Junio C Hamano wrote:

quoted

I guess that question indicates that the part of my message you
did not quote was not written cleanly enough.

It was; I'm just stupid.

Let's make the special case "linux-master" and then Linus gets what he wants 
and consistency is restored.

No?  Okay, I give up then. :-)

What about we do instead:

	[branch]
		mergeMessageTemplate = "Merge '%(remoteref)' from '%(remoteurl)' into '%(localref)'
%(summary)"
	[branch "master"]
		mergeMessageTemplate = "Merge '%(remoteref)' from '%(remoteurl)'
%(summary)"

?  IOW let the user supply the merge template message in the
repository config somehow and use string placeholders like what
show-ref accepts?  Then the default can be to not have the "into" at
all, and Linus surely could just set his branch.mergeMessageTemplate
to a string which gives him the message that he and his fellow
kernel hackers find to be useful?

--