From: Junio C Hamano <gitster@pobox•com>
To: Matthieu Moy <Matthieu.Moy@grenoble-inp•fr>
Cc: git@vger•kernel.org
Subject: Re: [PATCH 2/2] add: add a newline at the end of pathless 'add [-u|-A]' warning
Date: Tue, 02 Apr 2013 09:31:25 -0700 [thread overview]
Message-ID: <7vppycgahu.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <vpqehetgfh0.fsf@grenoble-inp.fr> (Matthieu Moy's message of "Tue, 02 Apr 2013 16:43:55 +0200")
Matthieu Moy <Matthieu.Moy@grenoble-inp•fr> writes:
> I'm fine with either dropping my patch or applying it as-is (with
> s/newline/blank line/ in the commit message).
OK; let's insert it immediately after e24afab09137 (add: make
pathless 'add [-u|-A]' warning a file-global function, 2013-03-19),
like the attached.
I'd prefer to spell this
die("...\n"
"");
over
die("...\n");
as the latter _looks_ as if the author didn't know die() gives us
line termination. The former hopefully is more explicit that we do
want an empty line at the end.
commit a8ed21a59219e8fe81b76ed0961641555f25cdad
Author: Matthieu Moy <Matthieu.Moy@imag•fr>
Date: Mon Mar 11 09:01:33 2013 +0100
add: add a blank line at the end of pathless 'add [-u|-A]' warning
When the commands give an actual output (e.g. when ran with -v), the
output is visually mixed with the warning.
An additional blank line makes the actual output more visible.
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag•fr>
Signed-off-by: Junio C Hamano <gitster@pobox•com>
diff --git a/builtin/add.c b/builtin/add.c
index a4028ee..db02233 100644
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -57,7 +57,9 @@ static void warn_pathless_add(void)
" git add %s .\n"
" (or git add %s .)\n"
"\n"
- "With the current Git version, the command is restricted to the current directory."),
+ "With the current Git version, the command is restricted to "
+ "the current directory.\n",
+ ""),
option_with_implicit_dot, short_option_with_implicit_dot,
option_with_implicit_dot, short_option_with_implicit_dot,
option_with_implicit_dot, short_option_with_implicit_dot);
next prev parent reply other threads:[~2013-04-02 16:31 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 [this message]
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
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=7vppycgahu.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox$(echo .)com \
--cc=Matthieu.Moy@grenoble-inp$(echo .)fr \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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