From: Jonathan Nieder <jrnieder@gmail.com>
To: Matthieu Moy <Matthieu.Moy@imag.fr>
Cc: git@vger.kernel.org, gitster@pobox.com,
Robin Rosenberg <robin.rosenberg@dewire.com>,
Piotr Krukowiecki <piotr.krukowiecki@gmail.com>,
Eric James Michael Ritz <lobbyjones@gmail.com>,
Tomas Carnecky <tomas.carnecky@gmail.com>
Subject: Re: [PATCH v2] add: warn when -u or -A is used without filepattern
Date: Sun, 27 Jan 2013 04:22:26 -0800 [thread overview]
Message-ID: <20130127122226.GB7670@elie.Belkin> (raw)
In-Reply-To: <1359110978-20054-1-git-send-email-Matthieu.Moy@imag.fr>
Hi Matthieu,
Matthieu Moy wrote:
> --- a/builtin/add.c
> +++ b/builtin/add.c
[...]
> @@ -392,8 +420,14 @@ int cmd_add(int argc, const char **argv, const char *prefix)
> die(_("-A and -u are mutually incompatible"));
> if (!show_only && ignore_missing)
> die(_("Option --ignore-missing can only be used together with --dry-run"));
> - if ((addremove || take_worktree_changes) && !argc) {
> + if (addremove)
> + option_with_implicit_dot = "--all";
> + if (take_worktree_changes)
> + option_with_implicit_dot = "--update";
I agree with Junio that these are most often spelled as "-A" and "-u".
> + if (option_with_implicit_dot && !argc) {
> static const char *here[2] = { ".", NULL };
> + if (prefix)
> + warn_pathless_add(option_with_implicit_dot);
For what it's worth, with or without s/--all/-A/ and s/--update/-u/,
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Thanks. If someone wants to preserve the spelling of the option name
passed by the user, that can happen as a patch on top.
next prev parent reply other threads:[~2013-01-27 12:22 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-19 21:35 [RFC] git rm -u Eric James Michael Ritz
2013-01-19 21:47 ` Tomas Carnecky
2013-01-19 21:49 ` Antoine Pelisse
2013-01-19 21:56 ` Eric James Michael Ritz
2013-02-25 6:54 ` Junio C Hamano
2013-02-25 18:54 ` Antoine Pelisse
2013-02-25 19:07 ` Matthieu Moy
2013-02-25 19:21 ` Antoine Pelisse
2013-02-25 19:39 ` Matthieu Moy
2013-02-25 19:47 ` Junio C Hamano
2013-01-19 21:49 ` Jonathan Nieder
2013-01-19 22:01 ` Eric James Michael Ritz
2013-01-20 11:32 ` Matthieu Moy
2013-01-20 18:42 ` Junio C Hamano
2013-01-20 21:27 ` Junio C Hamano
2013-01-20 22:17 ` Martin von Zweigbergk
2013-01-21 8:44 ` Matthieu Moy
2013-01-20 18:53 ` Junio C Hamano
2013-01-20 19:21 ` Eric James Michael Ritz
2013-01-21 8:09 ` Piotr Krukowiecki
2013-01-21 8:37 ` Matthieu Moy
2013-01-21 9:23 ` Junio C Hamano
2013-01-21 19:01 ` Junio C Hamano
2013-01-21 20:03 ` Matthieu Moy
2013-01-21 23:18 ` Junio C Hamano
2013-01-21 19:10 ` Piotr Krukowiecki
2013-01-21 12:00 ` [RFC/PATCH] add: warn when -u or -A is used without filepattern Matthieu Moy
2013-01-21 15:00 ` Robin Rosenberg
2013-01-21 15:16 ` Matthieu Moy
2013-01-21 20:29 ` Robin Rosenberg
2013-01-21 19:12 ` Junio C Hamano
2013-01-21 19:34 ` Piotr Krukowiecki
2013-01-21 20:06 ` Matthieu Moy
2013-01-21 20:10 ` Matthieu Moy
2013-01-21 22:22 ` Jonathan Nieder
2013-01-22 7:39 ` Matthieu Moy
2013-01-25 10:49 ` [PATCH v2] " Matthieu Moy
2013-01-25 19:27 ` Junio C Hamano
2013-01-27 16:10 ` Matthieu Moy
2013-01-27 20:33 ` Junio C Hamano
2013-01-28 8:48 ` Matthieu Moy
2013-01-28 9:16 ` [PATCH v3] " Matthieu Moy
2013-01-28 9:20 ` Jonathan Nieder
2013-01-28 12:47 ` Michael J Gruber
2013-01-28 18:07 ` Junio C Hamano
2013-01-28 18:25 ` Matthieu Moy
2013-01-28 18:31 ` Junio C Hamano
2013-02-14 23:36 ` Junio C Hamano
2013-02-14 23:55 ` Junio C Hamano
2013-02-15 10:00 ` Matthieu Moy
2013-01-27 12:22 ` Jonathan Nieder [this message]
2013-01-22 1:10 ` [RFC/PATCH] " Duy Nguyen
2013-01-22 1:51 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130127122226.GB7670@elie.Belkin \
--to=jrnieder@gmail.com \
--cc=Matthieu.Moy@imag.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=lobbyjones@gmail.com \
--cc=piotr.krukowiecki@gmail.com \
--cc=robin.rosenberg@dewire.com \
--cc=tomas.carnecky@gmail.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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox