From: Junio C Hamano <gitster@pobox.com>
To: Ramsay Jones <ramsay@ramsayjones.plus.com>
Cc: "René Scharfe" <l.s.r@web.de>,
"Jonathan Nieder" <jrnieder@gmail.com>,
"GIT Mailing-list" <git@vger.kernel.org>
Subject: Re: [PATCH] builtin/add: add detail to a 'cannot chmod' error message
Date: Tue, 08 Aug 2017 22:45:32 -0700 [thread overview]
Message-ID: <xmqqd1858fb7.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <aa004526-3e0d-66d4-287f-30abd29758fc@ramsayjones.plus.com> (Ramsay Jones's message of "Wed, 9 Aug 2017 01:51:23 +0100")
Ramsay Jones <ramsay@ramsayjones.plus.com> writes:
> In addition to adding the missing newline, add the x-ecutable bit
> 'mode change' character to the error message. This message now has
> the same form as similar messages output by 'update-index'.
>
> Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
> ---
>
> Hi Junio,
>
> This is v2 of the earlier "add a newline" patch. Thanks!
Thanks; here is me reminding myself to apply this with Jonathan's
reviewed-by in the morning.
>
> ATB,
> Ramsay Jones
>
> builtin/add.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/builtin/add.c b/builtin/add.c
> index e888fb8c5..5d5773d5c 100644
> --- a/builtin/add.c
> +++ b/builtin/add.c
> @@ -32,7 +32,7 @@ struct update_callback_data {
> int add_errors;
> };
>
> -static void chmod_pathspec(struct pathspec *pathspec, int force_mode)
> +static void chmod_pathspec(struct pathspec *pathspec, char flip)
> {
> int i;
>
> @@ -42,8 +42,8 @@ static void chmod_pathspec(struct pathspec *pathspec, int force_mode)
> if (pathspec && !ce_path_match(ce, pathspec, NULL))
> continue;
>
> - if (chmod_cache_entry(ce, force_mode) < 0)
> - fprintf(stderr, "cannot chmod '%s'", ce->name);
> + if (chmod_cache_entry(ce, flip) < 0)
> + fprintf(stderr, "cannot chmod %cx '%s'\n", flip, ce->name);
> }
> }
next prev parent reply other threads:[~2017-08-09 5:45 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-09 0:51 [PATCH] builtin/add: add detail to a 'cannot chmod' error message Ramsay Jones
2017-08-09 5:45 ` Junio C Hamano [this message]
2017-08-09 6:54 ` 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
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=xmqqd1858fb7.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
--cc=l.s.r@web.de \
--cc=ramsay@ramsayjones.plus.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).