git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Sverre Rabbelier" <alturin@gmail.com>
To: "Junio C Hamano" <gitster@pobox.com>
Cc: "Jeff King" <peff@peff.net>, "Mukund Sivaraman" <muks@banu.com>,
	git@vger.kernel.org
Subject: Re: Including branch info in git format-patch
Date: Thu, 19 Jun 2008 23:15:57 +0200	[thread overview]
Message-ID: <bd6139dc0806191415r64755ef3p90cecba7a074d9bc@mail.gmail.com> (raw)
In-Reply-To: <7vskv9rvrc.fsf@gitster.siamese.dyndns.org>

On Thu, Jun 19, 2008 at 10:54 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Jeff King <peff@peff.net> writes:
>
>> You could potentially add a config option to put the branch name inside
>> the '[PATCH]' text. This text is generally stripped away before
>> applying, so it would still free up the receiver to apply on whatever
>> branch they wanted. I don't think it would make sense for git
>> development, since we typically use topic branches, so keeping it
>> configurable would make sense.
>
> People would work on individual patches on topic branches that are named
> differently from the branch on the other end anyway (the branch that
> corresonds to the other end will be used for local integration testing in
> such a setup), so I do not see much point in stating which local branch
> happened to have been checked out when the patch was generated, in the
> output.

I think what Mukund is asking for is a way to specify what upstream
branch the commit should be applied to. This would be a feature to
help the person who is going to do the applying, so it is ok if the
person formatting the patch has to do a little work for that (e.g.,
specify which upstream branch to format-patch as a cmdline option)

> If you have a history of this shape:
<snip>
> which "branch label" would you give to the format-patch output that shows
> commit A?  It may apply to both master and next, and it is really up to
> the project's convention what to do with it.  The side branch the patch
> was developed on may be named "quick-hack", which would not have any
> relevance to the final location of where that patch wants to be in.

You would give it the label of the branch you want it applied to!

-- 
Cheers,

Sverre Rabbelier

  parent reply	other threads:[~2008-06-19 21:17 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-06-19 15:42 Including branch info in git format-patch Mukund Sivaraman
2008-06-19 20:28 ` Jeff King
2008-06-19 20:54   ` Junio C Hamano
2008-06-19 21:06     ` Jeff King
2008-06-19 21:08       ` Jeff King
2008-06-19 21:15     ` Sverre Rabbelier [this message]
2008-06-19 21:26     ` Mukund Sivaraman
2008-06-19 21:41       ` Junio C Hamano
2008-06-19 21:55         ` Mukund Sivaraman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=bd6139dc0806191415r64755ef3p90cecba7a074d9bc@mail.gmail.com \
    --to=alturin@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=muks@banu.com \
    --cc=peff@peff.net \
    --cc=sverre@rabbelier.nl \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).