Re: [PATCH 1/2] git-add: -s flag added (silently ignore files)

From: Junio C Hamano <gitster@pobox.com>
Date: Oct 1, 2012, 17:59 UTC
Message-ID: <7vipaucbur.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1349075700-26334-2-git-send-email-olaf.klischat@gmail.com>

Olaf Klischat <olaf.klischat@gmail.com> writes:

> Signed-off-by: Olaf Klischat <olaf.klischat@gmail.com>
> ---

I am personally not sympathetic to the reasoning stated in the proposed commit log message above your signed-off-by line; the change is not justified at all.

But I'll comment on the code changes anyway.

Show 22 quoted lines

>  builtin/add.c  |   14 +++++++++++---
>  t/t3700-add.sh |   17 ++++++++++++++++-
>  2 files changed, 27 insertions(+), 4 deletions(-)
>
> diff --git a/builtin/add.c b/builtin/add.c
> index e664100..61bb9ce 100644
> --- a/builtin/add.c
> +++ b/builtin/add.c
> @@ -313,7 +313,7 @@ static const char ignore_error[] =
>  N_("The following paths are ignored by one of your .gitignore files:\n");
>  
>  static int verbose = 0, show_only = 0, ignored_too = 0, refresh_only = 0;
> -static int ignore_add_errors, addremove, intent_to_add, ignore_missing = 0;
> +static int ignore_add_errors, addremove, intent_to_add, ignore_missing, silent_ignores = 0;
>  
>  static struct option builtin_add_options[] = {
>  	OPT__DRY_RUN(&show_only, N_("dry run")),
> @@ -329,6 +329,7 @@ static struct option builtin_add_options[] = {
>  	OPT_BOOLEAN( 0 , "refresh", &refresh_only, N_("don't add, only refresh the index")),
>  	OPT_BOOLEAN( 0 , "ignore-errors", &ignore_add_errors, N_("just skip files which cannot be added because of errors")),
>  	OPT_BOOLEAN( 0 , "ignore-missing", &ignore_missing, N_("check if - even missing - files are ignored in dry run")),
> +	OPT_BOOLEAN('s', "silent-ignores", &silent_ignores, N_("don't fail when ignored files are specified on the command line (ignore them silently)")),

I'd prefer not to see a new option whose worth hasn't been proven in the field to squat on any short-and-sweet single letter option name and would suggest replacing that 's' with 0, at least for now.

Show 6 quoted lines

> @@ -339,6 +340,11 @@ static int add_config(const char *var, const char *value, void *cb)
>  		ignore_add_errors = git_config_bool(var, value);
>  		return 0;
>  	}
> +	if (!strcmp(var, "add.silentignores") ||
> +	    !strcmp(var, "add.silent-ignores")) {

The second variant is unwarranted. We may have a variable or two that are accepted with '-' or '_' in their names, but they are backward compatibility measures, only to cover previous mistakes that named them in these letters in the first place.