From: "Heba Waly via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Heba Waly <heba.waly@gmail.com>,
Junio C Hamano <gitster@pobox.com>,
Heba Waly <heba.waly@gmail.com>
Subject: [PATCH 1/1] add: use advise function to display hints
Date: Thu, 02 Jan 2020 03:04:01 +0000 [thread overview]
Message-ID: <90608636bf184de76f91e4e04d9e796a021775a0.1577934241.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.508.git.1577934241.gitgitgadget@gmail.com>
From: Heba Waly <heba.waly@gmail.com>
Use the advise function in advice.c to display hints to the users, as
it provides a neat and a standard format for hint messages, i.e: the
text is colored in yellow and the line starts by the word "hint:".
Signed-off-by: Heba Waly <heba.waly@gmail.com>
---
builtin/add.c | 4 ++--
t/t3700-add.sh | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/builtin/add.c b/builtin/add.c
index 4c38aff419..eebf8d772b 100644
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -390,7 +390,7 @@ static int add_files(struct dir_struct *dir, int flags)
fprintf(stderr, _(ignore_error));
for (i = 0; i < dir->ignored_nr; i++)
fprintf(stderr, "%s\n", dir->ignored[i]->name);
- fprintf(stderr, _("Use -f if you really want to add them.\n"));
+ advise(_("Use -f if you really want to add them.\n"));
exit_status = 1;
}
@@ -480,7 +480,7 @@ int cmd_add(int argc, const char **argv, const char *prefix)
if (require_pathspec && pathspec.nr == 0) {
fprintf(stderr, _("Nothing specified, nothing added.\n"));
- fprintf(stderr, _("Maybe you wanted to say 'git add .'?\n"));
+ advise( _("Maybe you wanted to say 'git add .'?\n"));
return 0;
}
diff --git a/t/t3700-add.sh b/t/t3700-add.sh
index c325167b90..a649805369 100755
--- a/t/t3700-add.sh
+++ b/t/t3700-add.sh
@@ -326,7 +326,7 @@ test_expect_success 'git add --dry-run of an existing file output' "
cat >expect.err <<\EOF
The following paths are ignored by one of your .gitignore files:
ignored-file
-Use -f if you really want to add them.
+hint: Use -f if you really want to add them.
EOF
cat >expect.out <<\EOF
add 'track-this'
--
gitgitgadget
next prev parent reply other threads:[~2020-01-02 3:04 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-02 3:04 [PATCH 0/1] [Outreachy] [RFC] add: use advise function to display hints Heba Waly via GitGitGadget
2020-01-02 3:04 ` Heba Waly via GitGitGadget [this message]
2020-01-02 19:54 ` [PATCH 1/1] " Junio C Hamano
2020-01-02 22:47 ` Junio C Hamano
2020-01-07 10:54 ` Heba Waly
2020-01-07 16:35 ` Junio C Hamano
2020-01-07 23:32 ` Heba Waly
2020-01-06 23:13 ` Emily Shaffer
2020-01-06 23:18 ` Junio C Hamano
2020-01-07 4:19 ` Heba Waly
2020-01-06 23:07 ` Emily Shaffer
2020-01-06 23:13 ` Junio C Hamano
2020-01-07 23:12 ` [PATCH v2 0/1] [Outreachy] " Heba Waly via GitGitGadget
2020-01-07 23:12 ` [PATCH v2 1/1] " Heba Waly via GitGitGadget
2020-01-27 23:52 ` Emily Shaffer
2020-01-29 1:09 ` Heba Waly
2020-01-28 0:00 ` Jonathan Tan
2020-01-29 2:04 ` Heba Waly
2020-01-30 1:11 ` [PATCH v3] add: use advice API " Heba Waly via GitGitGadget
2020-01-30 21:59 ` Junio C Hamano
2020-01-31 11:16 ` Heba Waly
2020-02-05 21:18 ` Junio C Hamano
2020-02-05 22:05 ` Heba Waly
2020-02-05 22:18 ` Junio C Hamano
2020-02-05 23:05 ` Heba Waly
2020-02-05 23:18 ` 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=90608636bf184de76f91e4e04d9e796a021775a0.1577934241.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=heba.waly@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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).