From: Ye Xiaolong <xiaolong.ye@intel.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Stefan Beller <sbeller@google.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: Wed, 27 Apr 2016 15:33:50 +0800 [thread overview]
Message-ID: <20160427073350.GA30342@yexl-desktop> (raw)
In-Reply-To: <xmqq4maogpsw.fsf@gitster.mtv.corp.google.com>
On Tue, Apr 26, 2016 at 11:58:39AM -0700, Junio C Hamano wrote:
>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^
Thanks for the suggestion, I think this feature would definitely save
effort for end users and help to improve the usage rate of this "--base"
option.
If I understand it correctly, we should try to parse the "revision range"
specified in the fomat-patch cmdline if format.useAutoBase is set and we
couldn't find the remote-tracking branch, if its pattern matches something
like "<branchname>..<rev2>", we will try to get base commit from it:
- If it is a remote branch, just set its head as base
- If it isn't, try to set branchname@{u} as base
Please correct me if I'm wrong.
>
>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.
Shall I squash these enhancements in this series, or I need to make
another patch for them?
Thanks,
Xiaolong
next prev parent reply other threads:[~2016-04-27 7:35 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
2016-04-27 7:33 ` Ye Xiaolong [this message]
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=20160427073350.GA30342@yexl-desktop \
--to=xiaolong.ye@intel.com \
--cc=fengguang.wu@intel.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=julie.du@intel.com \
--cc=philip.li@intel.com \
--cc=sbeller@google.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).