kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'rj/add-chmod-error-message' into maint 

Message fix.

* rj/add-chmod-error-message:
  builtin/add: add detail to a 'cannot chmod' error message
maint
Junio C Hamano 2017-09-10 17:03:00 +09:00
parent 822a4d4178 1e22a9917b
commit 70def2c47f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/add.c
View File

@ -32,7 +32,7 @@ struct update_callback_data {
int add_errors; int add_errors;
}; };


static void chmod_pathspec(struct pathspec *pathspec, int force_mode) static void chmod_pathspec(struct pathspec *pathspec, char flip)
{ {
int i; int i;


@ -42,8 +42,8 @@ static void chmod_pathspec(struct pathspec *pathspec, int force_mode)
if (pathspec && !ce_path_match(ce, pathspec, NULL)) if (pathspec && !ce_path_match(ce, pathspec, NULL))
continue; continue;


if (chmod_cache_entry(ce, force_mode) < 0) if (chmod_cache_entry(ce, flip) < 0)
fprintf(stderr, "cannot chmod '%s'", ce->name); fprintf(stderr, "cannot chmod %cx '%s'\n", flip, ce->name);
} }
} }