diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-06-27 09:56:49 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-06-27 09:56:49 -0700 |
| commit | c49fd57bf472143b1a0bbfb246c91e6ea0f06887 (patch) | |
| tree | f2d6588d8302f18d43beb1e4f285f034e3c38513 /builtin/commit.c | |
| parent | Merge branch 'jk/avoid-unbounded-alloca' (diff) | |
| parent | add: add --chmod=+x / --chmod=-x options (diff) | |
| download | tgif-c49fd57bf472143b1a0bbfb246c91e6ea0f06887.tar.xz | |
Merge branch 'et/add-chmod-x'
"git update-index --add --chmod=+x file" may be usable as an escape
hatch, but not a friendly thing to force for people who do need to
use it regularly. "git add --chmod=+x file" can be used instead.
* et/add-chmod-x:
add: add --chmod=+x / --chmod=-x options
Diffstat (limited to 'builtin/commit.c')
| -rw-r--r-- | builtin/commit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/commit.c b/builtin/commit.c index 443ff9196d..163dbcabf3 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -386,7 +386,7 @@ static const char *prepare_index(int argc, const char **argv, const char *prefix */ if (all || (also && pathspec.nr)) { hold_locked_index(&index_lock, 1); - add_files_to_cache(also ? prefix : NULL, &pathspec, 0); + add_files_to_cache(also ? prefix : NULL, &pathspec, 0, 0); refresh_cache_or_die(refresh_flags); update_main_cache_tree(WRITE_TREE_SILENT); if (write_locked_index(&the_index, &index_lock, CLOSE_LOCK)) |