Re: [PATCH v6 0/4] Add --base option to git-format-patch to record base tree info

2016-04-27 Thread Stefan Beller
On Wed, Apr 27, 2016 at 8:04 AM, Junio C Hamano wrote: > Ye Xiaolong writes: > >> On Tue, Apr 26, 2016 at 11:58:39AM -0700, Junio C Hamano wrote: >> >>>Let's hear from folks at Intel ;-) Both of the above sounds like >>>sensible enhancements to me. >> >>

Re: [PATCH v6 0/4] Add --base option to git-format-patch to record base tree info

2016-04-27 Thread Junio C Hamano
Ye Xiaolong writes: > On Tue, Apr 26, 2016 at 11:58:39AM -0700, Junio C Hamano wrote: > >>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

Re: [PATCH v6 0/4] Add --base option to git-format-patch to record base tree info

2016-04-27 Thread Ye Xiaolong
On Tue, Apr 26, 2016 at 11:58:39AM -0700, Junio C Hamano wrote: >Stefan Beller 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?

Re: [PATCH v6 0/4] Add --base option to git-format-patch to record base tree info

2016-04-26 Thread Stefan Beller
On Tue, Apr 26, 2016 at 11:20 AM, Stefan Beller wrote: > On Tue, Apr 26, 2016 at 11:05 AM, Junio C Hamano wrote: >> 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 >>

Re: [PATCH v6 0/4] Add --base option to git-format-patch to record base tree info

2016-04-26 Thread Junio C Hamano
Stefan Beller 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

Re: [PATCH v6 0/4] Add --base option to git-format-patch to record base tree info

2016-04-26 Thread Stefan Beller
On Tue, Apr 26, 2016 at 11:30 AM, Junio C Hamano wrote: > Stefan Beller writes: > >> 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

Re: [PATCH v6 0/4] Add --base option to git-format-patch to record base tree info

2016-04-26 Thread Junio C Hamano
Stefan Beller writes: > 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

Re: [PATCH v6 0/4] Add --base option to git-format-patch to record base tree info

2016-04-26 Thread Stefan Beller
On Tue, Apr 26, 2016 at 11:05 AM, Junio C Hamano wrote: > Stefan Beller 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

Re: [PATCH v6 0/4] Add --base option to git-format-patch to record base tree info

2016-04-26 Thread Junio C Hamano
Stefan Beller 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:

Re: [PATCH v6 0/4] Add --base option to git-format-patch to record base tree info

2016-04-26 Thread Stefan Beller
On Tue, Apr 26, 2016 at 12:51 AM, Xiaolong Ye wrote: > Thanks for Junio's reviews and suggestions. > > This version contains the following changes since v5: > > - Fix a decl-after-statement in patch 3/4. > > - Improve testcases to cover more scenarios and make them more

[PATCH v6 0/4] Add --base option to git-format-patch to record base tree info

2016-04-26 Thread Xiaolong Ye
Thanks for Junio's reviews and suggestions. This version contains the following changes since v5: - Fix a decl-after-statement in patch 3/4. - Improve testcases to cover more scenarios and make them more portable and readable. Thanks, Xiaolong Xiaolong Ye (4): patch-ids: make