From: Junio C Hamano <gitster@pobox•com>
To: Paul Tan <pyokagan@gmail•com>
Cc: Remi Lespinet <remi.lespinet@ensimag•grenoble-inp.fr>,
Git List <git@vger•kernel.org>,
Remi Galan <remi.galan-alfonso@ensimag•grenoble-inp.fr>,
Guillaume Pages <guillaume.pages@ensimag•grenoble-inp.fr>,
Louis-Alexandre Stuber
<louis--alexandre.stuber@ensimag•grenoble-inp.fr>,
Antoine Delaite <antoine.delaite@ensimag•grenoble-inp.fr>,
Matthieu Moy <matthieu.moy@grenoble-inp•fr>
Subject: Re: [PATCH 3/3] git-am: add am.threeWay config variable
Date: Thu, 28 May 2015 10:57:31 -0700 [thread overview]
Message-ID: <xmqqy4k8h9f8.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <CACRoPnSnwA5GcYZjHHTepz4WzXYuJ+9nJqGsL92r_vnsNrN_-w@mail.gmail.com> (Paul Tan's message of "Thu, 28 May 2015 21:47:47 +0800")
Paul Tan <pyokagan@gmail•com> writes:
>> diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
>> index 0d8ba48..3190c05 100644
>> --- a/Documentation/git-am.txt
>> +++ b/Documentation/git-am.txt
>> @@ -89,11 +89,13 @@ default. You can use `--no-utf8` to override this.
>> linkgit:git-mailinfo[1]).
>>
>> -3::
>> ---3way::
>> +--[no-]3way::
>
> There's no need to mention --no-3way,...
Actually, we prefer to do it this way:
-3::
--3way::
--no-3way::
Describe what --3way does here.
$ git grep -e '^--no-' -e '^--\[no-\]' Documentation/
>> When the patch does not apply cleanly, fall back on
>> 3-way merge if the patch records the identity of blobs
>> it is supposed to apply to and we have those blobs
>> - available locally.
>> + available locally. `am.threeWay` configuration variable
>> + can be used to specify the default behaviour. `--no-3way`
>> + is useful to override `am.threeWay`.
>
> Usually configuration settings are mentioned in a separate section in
> the documentation "CONFIGURATION" (or not mentioned at all).
I can go either way, actually. But if the description mentions
am.threeWay as a way to tweak the default, it also should spell out
the default when the configuration is not there at all.
> Also, there's no need to mention that --no-3way can be used to
> mention the configuration, as its usual (and expected) that the
> configuration value sets the default behavior, and the
> command-line switch can override i.
Yes. Also --3way is useful to override `am.threeWay` set to `false` ;-)
> To end off, some off-tangent issues that are not related to the patch
> series in question, but since I'm looking at git-am.sh....
>
> I've noticed that in the block above that initializes all the variables,
>
> sign= utf8=t keep= keepcr= skip= interactive= resolved= rebasing= abort=
> messageid= resolvemsg= resume= scissors= no_inbody_headers=
> git_apply_opt=
> committer_date_is_author_date=
> ignore_date=
> allow_rerere_autoupdate=
> gpg_sign_opt=
>
> threeway is not initialized at all, and thus I think running
> "threeway=t git am blah" will affect the behavior of git-am.
Correct. I overlooked this when I originally did threeway. Perhaps
a preparatory bugfix patch is warranted before this one.
> Also, I noticed that we do not check for --no-interactive,
> --no-signoff, --no-keep, --no-whitespace, etc.
Even though adding support for them would not hurt, lack of these
are OK, as long as we do not have configuration variables to tweak
their defaults.
next prev parent reply other threads:[~2015-05-28 17:57 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-26 21:32 [PATCH 1/3] t4150-am: refactor and clean common setup Remi Lespinet
2015-05-26 21:32 ` [PATCH 2/3] t4150-am: refactor am -3 tests Remi Lespinet
2015-05-26 21:32 ` [PATCH 3/3] git-am: add am.threeWay config variable Remi Lespinet
2015-05-28 13:47 ` Paul Tan
2015-05-28 17:57 ` Junio C Hamano [this message]
2015-05-28 19:20 ` Matthieu Moy
2015-05-28 13:10 ` [PATCH 1/3] t4150-am: refactor and clean common setup Paul Tan
2015-05-28 18:15 ` Eric Sunshine
2015-05-29 11:50 ` Remi LESPINET
2015-05-28 19:09 ` Eric Sunshine
2015-05-28 19:18 ` Eric Sunshine
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqy4k8h9f8.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=antoine.delaite@ensimag$(echo .)grenoble-inp.fr \
--cc=git@vger$(echo .)kernel.org \
--cc=guillaume.pages@ensimag$(echo .)grenoble-inp.fr \
--cc=louis--alexandre.stuber@ensimag$(echo .)grenoble-inp.fr \
--cc=matthieu.moy@grenoble-inp$(echo .)fr \
--cc=pyokagan@gmail$(echo .)com \
--cc=remi.galan-alfonso@ensimag$(echo .)grenoble-inp.fr \
--cc=remi.lespinet@ensimag$(echo .)grenoble-inp.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox