From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>,
git@vger.kernel.org, David Aguilar <davvid@gmail.com>
Subject: Re: [PATCH 2/2] add: respect add.updateroot config option
Date: Wed, 13 Mar 2013 08:51:08 -0700 [thread overview]
Message-ID: <7vmwu747tf.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <20130313092754.GA12658@sigill.intra.peff.net> (Jeff King's message of "Wed, 13 Mar 2013 05:27:54 -0400")
Jeff King <peff@peff.net> writes:
>> Your patch doesn't advertise the option in the warning message, which I
>> think is good. You may mention it the commit message that this is a
>> deliberate choice.
>
> Yes, it was deliberate. I can add a note.
>
>> > +add.updateroot::
>>
>> Detail: option names are normally camelCased => updateRoot.
>
> Good point, thanks.
>
>> I think the option name needs a bit more thinking. Without reading the
>> doc,
>>
>> [add]
>> updateRoot = false
>>
>> would be a very tempting thing to try. Perhaps explicitly warning when
>> add.updateroot is set to false would avoid possible confusion.
This is essentially the same as Matthieu's add.use2dot0Behavior but
with that "it is an error to explicitly set it to false" twist, it
alleviates one of the worries. It still has the same "the user saw
it mentioned on stackoverflow and sets it without understanding that
the behaviour is getting changed" effect.
Also it won't give chance for scripts to get fixed, even though I
suspect that instances of "add -u/-A" without pathspec end users
write in their custom scripts almost always would want to be
tree-wide and it is a bug that they do not pass ":/" to them.
The "future.*" (I'd rather call that "migration.*") approach with
the "never set it to false" twist is probably OK from the "complaint
avoidance" perspective. The user cannot later complain "I tried to
squelch the advice but at the same time I ended up adding updated
contents outside my diretory", without getting told "That is the
documented behaviour, isn't it?" But I still think it is much less
nice from "avoid hurting the users" perspective. If the way to
squelch the user learns were to say "git add -u .", where the user
explicitly says "take the updated contents from this directory and
below", there is no room for confusion. We won't hear complaints
either way, but with the "future.*" the reason why we won't hear
complaints is because the users do not have excuse to complain.
With the "require explicit .", it is because the users won't get
hurt in the first place.
> I dunno. I am not all that excited about this patch, due to all of the
> caveats that we need to communicate to the user. The current warning has
> annoyed me a few times, but perhaps it is still too soon, and my fingers
> and brain just need retraining. I think a config option could help some
> people, but maybe it will end up hurting more. I'm inclined at this
> point to table the patch for now and see how I feel in a few weeks.
>
> I do think patch 1/2 makes sense regardless.
These two concluding paragraphs match my current thinking.
Thanks.
next prev parent reply other threads:[~2013-03-13 15:51 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-08 23:54 [PATCH 0/2] "git add -u/-A" from future Junio C Hamano
2013-03-08 23:54 ` [PATCH 1/2] require pathspec for "git add -u/-A" Junio C Hamano
2013-03-10 15:49 ` Matthieu Moy
2013-03-11 7:04 ` Junio C Hamano
2013-03-11 8:00 ` Matthieu Moy
2013-03-11 8:01 ` [PATCH 1/2] add: update pathless 'add [-u|-A]' warning to reflect change of plan Matthieu Moy
2013-03-11 8:01 ` [PATCH 2/2] add: add a newline at the end of pathless 'add [-u|-A]' warning Matthieu Moy
2013-03-11 16:06 ` Junio C Hamano
2013-04-02 14:43 ` Matthieu Moy
2013-04-02 16:31 ` Junio C Hamano
2013-04-02 16:57 ` Matthieu Moy
2013-03-12 11:28 ` [PATCH 1/2] require pathspec for "git add -u/-A" Jeff King
2013-03-12 13:58 ` Matthieu Moy
2013-03-13 4:08 ` Jeff King
2013-03-13 4:10 ` [PATCH 1/2] t2200: check that "add -u" limits itself to subdirectory Jeff King
2013-03-13 8:52 ` Matthieu Moy
2013-03-13 17:44 ` Junio C Hamano
2013-03-14 6:44 ` Jeff King
2013-03-13 4:10 ` [PATCH 2/2] add: respect add.updateroot config option Jeff King
2013-03-13 9:07 ` Matthieu Moy
2013-03-13 9:27 ` Jeff King
2013-03-13 15:51 ` Junio C Hamano [this message]
2013-03-14 12:39 ` Matthieu Moy
2013-03-19 3:44 ` [PATCH 0/4] make pathless 'add [-u|-A]' warning less noisy Jonathan Nieder
2013-03-19 3:45 ` [PATCH 1/4] add: make pathless 'add [-u|-A]' warning a file-global function Jonathan Nieder
2013-03-19 3:46 ` [PATCH 2/4] add: make warn_pathless_add() a no-op after first call Jonathan Nieder
2013-03-19 3:48 ` [PATCH 3/4] add -u: only show pathless 'add -u' warning when changes exist outside cwd Jonathan Nieder
2013-03-19 4:25 ` Junio C Hamano
2013-03-19 5:28 ` Jonathan Nieder
2013-03-19 14:57 ` Junio C Hamano
2013-03-19 5:34 ` Jonathan Nieder
2013-03-19 5:37 ` Duy Nguyen
2013-03-19 5:44 ` Jonathan Nieder
2013-03-19 6:21 ` Matthieu Moy
2013-03-19 15:06 ` Junio C Hamano
2013-03-19 19:06 ` Jonathan Nieder
2013-03-19 19:47 ` Junio C Hamano
2013-03-19 20:34 ` Jonathan Nieder
2013-03-19 3:49 ` [PATCH 4/4] add -A: only show pathless 'add -A' " Jonathan Nieder
2013-03-19 4:25 ` [PATCH 0/4] make pathless 'add [-u|-A]' warning less noisy Jeff King
2013-03-08 23:54 ` [PATCH 2/2] git add: -u/-A now affects the entire working tree Junio C Hamano
2013-03-19 22:44 ` [PATCH v2 0/6] make pathless 'add [-u|-A]' warning less noisy Jonathan Nieder
2013-03-19 22:44 ` [PATCH 1/6] t2200: check that "add -u" limits itself to subdirectory Jonathan Nieder
2013-03-19 22:45 ` [PATCH 2/6] add: make pathless 'add [-u|-A]' warning a file-global function Jonathan Nieder
2013-03-19 22:45 ` [PATCH 3/6] add: make warn_pathless_add() a no-op after first call Jonathan Nieder
2013-03-19 22:50 ` [PATCH 4/6] add -u: only show pathless 'add -u' warning when changes exist outside cwd Jonathan Nieder
2013-03-20 5:06 ` Jeff King
2013-03-20 15:10 ` Junio C Hamano
2013-03-19 22:51 ` [PATCH 5/6] add -A: only show pathless 'add -A' " Jonathan Nieder
2013-03-20 15:30 ` Junio C Hamano
2013-03-19 22:53 ` [PATCH 6/6] git add: -u/-A now affects the entire working tree Jonathan Nieder
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=7vmwu747tf.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
/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.
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 NNTP newsgroup(s).