From: Junio C Hamano <gitster@pobox.com>
To: "Rubén Justo" <rjusto@gmail.com>
Cc: Git List <git@vger.kernel.org>
Subject: Re: [PATCH 1/3] add: use advise_if_enabled for ADVICE_ADD_IGNORED_FILE
Date: Fri, 29 Mar 2024 10:40:05 -0700 [thread overview]
Message-ID: <xmqqv855ym16.fsf@gitster.g> (raw)
In-Reply-To: <37f79186-b849-496a-ae91-f5e05a280dae@gmail.com> ("Rubén Justo"'s message of "Fri, 29 Mar 2024 05:19:03 +0100")
Rubén Justo <rjusto@gmail.com> writes:
> - if (advice_enabled(ADVICE_ADD_IGNORED_FILE))
> - advise(_("Use -f if you really want to add them.\n"
> - "Turn this message off by running\n"
> - "\"git config advice.addIgnoredFile false\""));
> + advise_if_enabled(ADVICE_ADD_IGNORED_FILE,
> + _("Use -f if you really want to add them."));
Good.
> exit_status = 1;
> }
>
> diff --git a/t/t3700-add.sh b/t/t3700-add.sh
> index f23d39f0d5..76c2c9e7b0 100755
> --- a/t/t3700-add.sh
> +++ b/t/t3700-add.sh
> @@ -370,8 +370,7 @@ cat >expect.err <<\EOF
> The following paths are ignored by one of your .gitignore files:
> ignored-file
> hint: Use -f if you really want to add them.
> -hint: Turn this message off by running
> -hint: "git config advice.addIgnoredFile false"
> +hint: Disable this message with "git config advice.addIgnoredFile false"
Funny that we weremanually crafting the hint to turn it off. Nice
to see that code go.
> EOF
> cat >expect.out <<\EOF
> add 'track-this'
> diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh
> index 00c1f1aab1..5c4a89df5c 100755
> --- a/t/t7400-submodule-basic.sh
> +++ b/t/t7400-submodule-basic.sh
> @@ -212,8 +212,7 @@ test_expect_success 'submodule add to .gitignored path fails' '
> The following paths are ignored by one of your .gitignore files:
> submod
> hint: Use -f if you really want to add them.
> - hint: Turn this message off by running
> - hint: "git config advice.addIgnoredFile false"
> + hint: Disable this message with "git config advice.addIgnoredFile false"
> EOF
> # Does not use test_commit due to the ignore
> echo "*" > .gitignore &&
next prev parent reply other threads:[~2024-03-29 17:40 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-29 4:14 [PATCH 0/3] add: use advise_if_enabled Rubén Justo
2024-03-29 4:19 ` [PATCH 1/3] add: use advise_if_enabled for ADVICE_ADD_IGNORED_FILE Rubén Justo
2024-03-29 17:40 ` Junio C Hamano [this message]
2024-03-29 4:19 ` [PATCH 2/3] add: use advise_if_enabled for ADVICE_ADD_EMPTY_PATHSPEC Rubén Justo
2024-03-29 4:19 ` [PATCH 3/3] add: use advise_if_enabled for ADVICE_ADD_EMBEDDED_REPO Rubén Justo
2024-03-29 17:55 ` Junio C Hamano
2024-03-29 19:04 ` Rubén Justo
2024-03-29 19:31 ` Junio C Hamano
2024-03-29 19:59 ` Rubén Justo
2024-03-29 20:59 ` Junio C Hamano
2024-03-30 13:35 ` Rubén Justo
2024-03-29 17:28 ` [PATCH 0/3] add: use advise_if_enabled Junio C Hamano
2024-03-29 19:16 ` Rubén Justo
2024-03-30 14:00 ` [PATCH v2 " Rubén Justo
2024-03-30 14:07 ` [PATCH v2 1/3] add: use advise_if_enabled for ADVICE_ADD_IGNORED_FILE Rubén Justo
2024-03-30 14:08 ` [PATCH v2 2/3] add: use advise_if_enabled for ADVICE_ADD_EMPTY_PATHSPEC Rubén Justo
2024-03-30 14:09 ` [PATCH v2 3/3] add: use advise_if_enabled for ADVICE_ADD_EMBEDDED_REPO Rubén Justo
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=xmqqv855ym16.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=rjusto@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.