git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Stefan Beller <sbeller@google.com>
Cc: Xiaolong Ye <xiaolong.ye@intel.com>,
	"git\@vger.kernel.org" <git@vger.kernel.org>,
	Fengguang Wu <fengguang.wu@intel.com>,
	ying.huang@intel.com, philip.li@intel.com, julie.du@intel.com
Subject: Re: [PATCH v6 0/4] Add --base option to git-format-patch to record base tree info
Date: Tue, 26 Apr 2016 11:58:39 -0700	[thread overview]
Message-ID: <xmqq4maogpsw.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <CAGZ79kZNV+g3_Rmpynh-WQVc3dW6nuNDsTM=gTxNuJnr3V3Azg@mail.gmail.com> (Stefan Beller's message of "Tue, 26 Apr 2016 11:43:15 -0700")

Stefan Beller <sbeller@google.com> writes:

>> So from where are you proposing Git to grab that information if you
>> do not tell it?  "If the HEAD is detached, assume that the base is
>> where it was detached from" or something?
>
> That would also work for me. In my first mail I was proposing to take
> the information from the format-patch argument, such that a one off fix
> would be:
>
>     (1) git checkout origin/master
>     (2) EDIT
>     (3) git commit -a -m "fix"
>     (4) git format-patch origin/master..  # <- This is the information.
>
> However you read it as taking the information from the first line,
> which is also fine with me, as then the (4) can become
>
>     (4a) git format-patch HEAD^

Either would work, but reading from (4) feels a lot less black magic
to me.

>> If you are doing "format-patch master..my-branch", what do you
>> propose to set your base to?  master@{u}, perhaps?
>
> Yes. (I usually use that command with |s|master|origin/master|, so the
> argument is the upstream already. A local master branch does not exist for me.)

Let's hear from folks at Intel ;-) Both of the above sounds like
sensible enhancements to me.

  reply	other threads:[~2016-04-26 18:58 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-26  7:51 [PATCH v6 0/4] Add --base option to git-format-patch to record base tree info Xiaolong Ye
2016-04-26  7:51 ` [PATCH v6 1/4] patch-ids: make commit_patch_id() a public helper function Xiaolong Ye
2016-04-26  7:51 ` [PATCH v6 2/4] format-patch: add '--base' option to record base tree info Xiaolong Ye
2016-04-26  7:51 ` [PATCH v6 3/4] format-patch: introduce --base=auto option Xiaolong Ye
2016-04-26  7:51 ` [PATCH v6 4/4] format-patch: introduce format.useAutoBase configuration Xiaolong Ye
2016-04-26 17:11   ` Stefan Beller
2016-04-26 17:21 ` [PATCH v6 0/4] Add --base option to git-format-patch to record base tree info Stefan Beller
2016-04-26 18:05   ` Junio C Hamano
2016-04-26 18:20     ` Stefan Beller
2016-04-26 18:30       ` Junio C Hamano
2016-04-26 18:43         ` Stefan Beller
2016-04-26 18:58           ` Junio C Hamano [this message]
2016-04-27  7:33             ` Ye Xiaolong
2016-04-27 15:04               ` Junio C Hamano
2016-04-27 15:45                 ` Stefan Beller
2016-04-26 22:56       ` Stefan Beller

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

  List information: http://vger.kernel.org/majordomo-info.html

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

  git send-email \
    --in-reply-to=xmqq4maogpsw.fsf@gitster.mtv.corp.google.com \
    --to=gitster@pobox.com \
    --cc=fengguang.wu@intel.com \
    --cc=git@vger.kernel.org \
    --cc=julie.du@intel.com \
    --cc=philip.li@intel.com \
    --cc=sbeller@google.com \
    --cc=xiaolong.ye@intel.com \
    --cc=ying.huang@intel.com \
    /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.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).