From: Denton Liu <liu.denton@gmail.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: "Git Mailing List" <git@vger.kernel.org>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Junio C Hamano" <gitster@pobox.com>
Subject: Re: [RFC PATCH] config: learn the "onbranch:" includeIf condition
Date: Fri, 31 May 2019 14:44:48 -0400 [thread overview]
Message-ID: <20190531184448.GA1175@archbookpro.localdomain> (raw)
In-Reply-To: <nycvar.QRO.7.76.6.1905311918510.44@tvgsbejvaqbjf.bet>
On Fri, May 31, 2019 at 07:23:56PM +0200, Johannes Schindelin wrote:
> Hi Denton,
>
> On Fri, 31 May 2019, Denton Liu wrote:
>
> > On Fri, May 31, 2019 at 02:58:30PM +0200, Johannes Schindelin wrote:
> >
> > > On Thu, 30 May 2019, Denton Liu wrote:
> > >
[...]
>
> > > > I decided to go ahead and implement the includeIf onbranch semantics
> > > > for fun. For completeness, I'm sending it to the list but I'm not
> > > > really sure if this should get merged, since I don't really have a
> > > > use-case for this, especially if we go the branch-specific
> > > > format-patch config route.
> > > >
> > > > Another thing to note is that this change doesn't completely cover
> > > > all the use-cases that the branch-specific format-patch does. In
> > > > particular, if I run
> > > >
> > > > $ git checkout foo
> > > > $ git format-patch master..bar
> > > >
> > > > with the `format.bar.*`, we'd get bar-specific configs, whereas with
> > > > `includeIf "onbranch:bar"`, we'd fail to include bar-specific configs
> > > > and, more dangerously, we'd be including foo's configs.
> > >
> > > I actually think that this is fine. "on branch" means that you are on the
> > > specified branch, not that you merely mention the branch name on the
> > > command-line (in which case there would be the ambiguity "did the user
> > > mean `master` or `bar`?").
> >
> > The reason why I brought this up as a use case was because currently,
> > when format-patch generates a cover letter, with the above, it'll use
> > bar's branch description to populate it even if "foo" is checked out. As
> > a result, when implementing the branch-specific format-patch stuff, I
> > wanted to make this consistent so that we wouldn't end up in a situation
> > where the cover letter has the branch's description but is missing its
> > Cc's.
>
> That strikes me as a different use case than `includeIf`. I could imagine
> that you'd want a setting like `formatpatch.detecttargetbranch = auto` or
> some such that would pick up the `format.bar*` settings if there was *one*
> rev argument, and it was a commit range (or a tip commit), *and* it
> obviously referred to a single target branch.
Correct. For context, upthread I initially implemented the
branch-specific format-patch configs but Ævar suggested that we
implement the onbranch config semantics instead.
So I was just addressing the fact that this patch can't supercede the
branch-specific format-patch stuff since they have different use cases
so the other patchset has to coexist with this one. I'm happy to see
that we're both in agreement about this.
>
> It's just a scenario that is *very* specific to `git format-patch`.
>
> For example, I would not, ever, want `git log ..next` to pick up a
> config specific to `next` just because I mentioned a commit range with
> `range` as the tip to start from.
Yeah, I'd never dream of implementing something that gross ;)
>
> Ciao,
> Dscho
next prev parent reply other threads:[~2019-05-31 18:44 UTC|newest]
Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-05 16:24 [PATCH 0/7] teach branch-specific options for format-patch Denton Liu
2019-05-05 16:24 ` [PATCH 1/7] t4014: clean up style Denton Liu
2019-05-05 16:24 ` [PATCH 2/7] Doc: add more detail for git-format-patch Denton Liu
2019-05-05 16:24 ` [PATCH 3/7] branch.c: extract read_branch_config function Denton Liu
2019-05-05 16:24 ` [PATCH 4/7] format-patch: make cover letter subject configurable Denton Liu
2019-05-05 16:24 ` [PATCH 5/7] format-patch: move extra_headers logic later Denton Liu
2019-05-05 16:24 ` [PATCH 6/7] string-list: create string_list_append_all Denton Liu
2019-05-05 16:24 ` [PATCH 7/7] format-patch: read branch-specific To: and Cc: headers Denton Liu
2019-05-07 8:56 ` [PATCH 0/7] teach branch-specific options for format-patch Junio C Hamano
2019-05-07 14:19 ` Denton Liu
2019-05-07 15:05 ` Junio C Hamano
2019-05-07 15:21 ` Denton Liu
2019-05-07 15:46 ` Ævar Arnfjörð Bjarmason
2019-05-08 1:45 ` Junio C Hamano
2019-05-31 2:00 ` [RFC PATCH] config: learn the "onbranch:" includeIf condition Denton Liu
2019-05-31 12:58 ` Johannes Schindelin
2019-05-31 13:16 ` Denton Liu
2019-05-31 17:23 ` Johannes Schindelin
2019-05-31 18:44 ` Denton Liu [this message]
2019-05-31 19:33 ` [PATCH v2] " Denton Liu
2019-05-31 20:14 ` Johannes Schindelin
2019-06-05 8:02 ` Johannes Schindelin
2019-06-05 10:08 ` Duy Nguyen
2019-06-05 21:21 ` [PATCH v3] " Denton Liu
2019-06-06 12:52 ` Johannes Schindelin
2019-05-17 0:27 ` [PATCH v2 0/6] teach branch-specific options for format-patch Denton Liu
2019-05-17 0:27 ` [PATCH v2 1/6] t4014: clean up style Denton Liu
2019-05-17 0:27 ` [PATCH v2 2/6] Doc: add more detail for git-format-patch Denton Liu
2019-05-17 0:27 ` [PATCH v2 3/6] format-patch: make cover letter subject configurable Denton Liu
2019-05-17 0:27 ` [PATCH v2 4/6] format-patch: move extra_headers logic later Denton Liu
2019-05-17 0:27 ` [PATCH v2 5/6] string-list: create string_list_append_all Denton Liu
2019-05-17 0:27 ` [PATCH v2 6/6] format-patch: read branch-specific To: and Cc: headers Denton Liu
2019-05-17 4:12 ` [PATCH v2 0/6] teach branch-specific options for format-patch Junio C Hamano
2019-05-17 7:25 ` Denton Liu
2019-05-17 16:54 ` Denton Liu
2019-05-22 2:44 ` [PATCH v3 0/8] " Denton Liu
2019-05-22 2:44 ` [PATCH v3 1/8] t4014: clean up style Denton Liu
2019-05-22 2:44 ` [PATCH v3 2/8] Doc: add more detail for git-format-patch Denton Liu
2019-05-22 2:44 ` [PATCH v3 3/8] format-patch: infer cover letter from branch description Denton Liu
2019-05-22 2:44 ` [PATCH v3 4/8] format-patch: move extra_headers logic later Denton Liu
2019-05-22 2:44 ` [PATCH v3 5/8] string-list: create string_list_append_all Denton Liu
2019-05-22 2:44 ` [PATCH v3 6/8] format-patch: read branch-specific To: and Cc: headers Denton Liu
2019-05-22 2:44 ` [PATCH v3 7/8] format-patch: move output_directory logic later Denton Liu
2019-05-22 2:44 ` [PATCH v3 8/8] format-patch: read branch-specific output directory Denton Liu
2019-05-31 0:30 ` [PATCH v3 0/8] teach branch-specific options for format-patch Denton Liu
2019-06-14 21:56 ` [RESEND PATCH " Denton Liu
2019-06-14 21:56 ` [RESEND PATCH v3 1/8] t4014: clean up style Denton Liu
2019-06-14 21:56 ` [RESEND PATCH v3 2/8] Doc: add more detail for git-format-patch Denton Liu
2019-06-14 21:56 ` [RESEND PATCH v3 3/8] format-patch: infer cover letter from branch description Denton Liu
2019-06-14 21:56 ` [RESEND PATCH v3 4/8] format-patch: move extra_headers logic later Denton Liu
2019-06-14 21:56 ` [RESEND PATCH v3 5/8] string-list: create string_list_append_all Denton Liu
2019-06-14 21:56 ` [RESEND PATCH v3 6/8] format-patch: read branch-specific To: and Cc: headers Denton Liu
2019-06-14 21:56 ` [RESEND PATCH v3 7/8] format-patch: move output_directory logic later Denton Liu
2019-06-14 21:56 ` [RESEND PATCH v3 8/8] format-patch: read branch-specific output directory Denton Liu
2019-10-15 9:06 ` [PATCH v6 0/3] format-patch: learn --infer-cover-subject option (also t4014 cleanup) Denton Liu
2019-10-15 9:06 ` [PATCH v6 1/3] format-patch: replace erroneous and condition Denton Liu
2019-10-15 9:06 ` [PATCH v6 2/3] format-patch: use enum variables Denton Liu
2019-10-15 9:06 ` [PATCH v6 3/3] format-patch: teach --cover-from-description option Denton Liu
2019-10-16 1:28 ` [PATCH v6 0/3] format-patch: learn --infer-cover-subject option (also t4014 cleanup) Junio C Hamano
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=20190531184448.GA1175@archbookpro.localdomain \
--to=liu.denton@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).