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
This commit is contained in:
Junio C Hamano 2017-09-10 17:03:00 +09:00
commit 70def2c47f

View file

@ -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);
}
}