diff options
author | Junio C Hamano <gitster@pobox.com> | 2021-02-25 16:43:31 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-02-25 16:43:31 -0800 |
commit | f277234860b2e5e142ab72d2c288f6fd94bd2219 (patch) | |
tree | 7299096feda1b9981f776f7baf606c0456187e76 /builtin | |
parent | Merge branch 'ds/merge-base-independent' (diff) | |
parent | add: propagate --chmod errors to exit status (diff) | |
download | tgif-f277234860b2e5e142ab72d2c288f6fd94bd2219.tar.xz |
Merge branch 'mt/add-chmod-fixes'
Various fixes on "git add --chmod".
* mt/add-chmod-fixes:
add: propagate --chmod errors to exit status
add: mark --chmod error string for translation
add --chmod: don't update index when --dry-run is used
Diffstat (limited to 'builtin')
-rw-r--r-- | builtin/add.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/builtin/add.c b/builtin/add.c index a825887c50..ea762a41e3 100644 --- a/builtin/add.c +++ b/builtin/add.c @@ -38,19 +38,27 @@ struct update_callback_data { int add_errors; }; -static void chmod_pathspec(struct pathspec *pathspec, char flip) +static int chmod_pathspec(struct pathspec *pathspec, char flip, int show_only) { - int i; + int i, ret = 0; for (i = 0; i < active_nr; i++) { struct cache_entry *ce = active_cache[i]; + int err; if (pathspec && !ce_path_match(&the_index, ce, pathspec, NULL)) continue; - if (chmod_cache_entry(ce, flip) < 0) - fprintf(stderr, "cannot chmod %cx '%s'\n", flip, ce->name); + if (!show_only) + err = chmod_cache_entry(ce, flip); + else + err = S_ISREG(ce->ce_mode) ? 0 : -1; + + if (err < 0) + ret = error(_("cannot chmod %cx '%s'"), flip, ce->name); } + + return ret; } static int fix_unmerged_status(struct diff_filepair *p, @@ -609,7 +617,7 @@ int cmd_add(int argc, const char **argv, const char *prefix) exit_status |= add_files(&dir, flags); if (chmod_arg && pathspec.nr) - chmod_pathspec(&pathspec, chmod_arg[0]); + exit_status |= chmod_pathspec(&pathspec, chmod_arg[0], show_only); unplug_bulk_checkin(); finish: |