git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Stefan Beller <sbeller@google.com>
To: Junio C Hamano <gitster@pobox.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:20:58 -0700	[thread overview]
Message-ID: <CAGZ79kZg3OpR8k45=q1m-g=t+aGGs8VDYBrBYaBU_DbfuuoBig@mail.gmail.com> (raw)
In-Reply-To: <xmqqlh40gs9o.fsf@gitster.mtv.corp.google.com>

On Tue, Apr 26, 2016 at 11:05 AM, Junio C Hamano <gitster@pobox.com> wrote:
> Stefan Beller <sbeller@google.com> writes:
>
>>     git checkout origin/master
>>     # toy around, do stuff
>>     git checkout -b new-shiny-feature
>>     git format-patch origin-master..
>>
>> Now I have set the format.useautobase option and then the `git format-patch`
>> fails with
>>
>>     fatal: Failed to get upstream, if you want to record base commit
>> automatically,
>>     please use git branch --set-upstream-to to track a remote branch.
>>     Or you could specify base commit by --base=<base-commit-id> manually.
>>
>> but as I indicated I want patches from origin/master onwards,
>> Could we make use of that information?
>
> As you indicated where other than in this e-mail?
>
> I think the way for you to indicate that desire expected by this
> series is to use "git branch" to set upstream of new-shiny-feature
> branch to origin/master.  Shouldn't that work, or is that too much
> work?

I can totally do that for longer series which require some back and forth.

But one-offs, such as typo fixes or other small things[1], for which I do
even have a local branch (i.e. checkout origin/master && fix &&
commit && send-email) this is another step that potentially bothers me.
Maybe I'll get used to it.

>From a UI perspective it seems logical to also check if the base
can be obtained from the patch range specifier. the message of
patch 2 focuses on the advantages for the maintainer and 3rd party
people. So I was just testing it as an individual contributor to ensure
it can be used easily. (People only use this once the benefits outweigh
the disadvantages. And as we do not have any advantage of it in Git,
the negatives need to be kept low?)

Thanks,
Stefan

[1] http://thread.gmane.org/gmane.comp.version-control.git/292634

  reply	other threads:[~2016-04-26 18:21 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 [this message]
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
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='CAGZ79kZg3OpR8k45=q1m-g=t+aGGs8VDYBrBYaBU_DbfuuoBig@mail.gmail.com' \
    --to=sbeller@google.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=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).