# [PATCH] builtin/add: add detail to a 'cannot chmod' error message 3 messages from 2017-08-09 to 2017-08-09. Participants: Ramsay Jones, Junio C Hamano, Jonathan Nieder. Thread: https://gitlist.dev/t/46546 ## Ramsay Jones, 2017-08-09 00:51 Subject: [PATCH] builtin/add: add detail to a 'cannot chmod' error message Message-ID: URL: https://gitlist.dev/e/aa004526-3e0d-66d4-287f-30abd29758fc%40ramsayjones.plus.com ``` 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 --- Hi Junio, This is v2 of the earlier "add a newline" patch. Thanks! 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); } } -- 2.14.0 ``` ## Junio C Hamano, 2017-08-09 05:45 Subject: Re: [PATCH] builtin/add: add detail to a 'cannot chmod' error message Message-ID: URL: https://gitlist.dev/e/xmqqd1858fb7.fsf%40gitster.mtv.corp.google.com In-Reply-To: ``` Ramsay Jones 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 > --- > > 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); > } > } ``` ## Jonathan Nieder, 2017-08-09 06:54 Subject: Re: [PATCH] builtin/add: add detail to a 'cannot chmod' error message Message-ID: <20170809065435.GA29220@aiede.mtv.corp.google.com> URL: https://gitlist.dev/e/20170809065435.GA29220%40aiede.mtv.corp.google.com In-Reply-To: ``` Ramsay Jones wrote: > 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 > --- > This is v2 of the earlier "add a newline" patch. Thanks! > > builtin/add.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) Reviewed-by: Jonathan Nieder Thanks. ```