diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-07-06 13:06:39 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-07-06 13:06:39 -0700 |
| commit | c8b080af7108744299e26e8d38cb6587b933f9fc (patch) | |
| tree | 4854d78f67e5235d1aced705af3169b4185e8aac /builtin/commit.c | |
| parent | 1f5d429e4a15e909214785e30bb81168932fdc54 (diff) | |
| parent | 4e55ed32db81d06a4f618e2cc0f9da0e223ae304 (diff) | |
| download | git-c8b080af7108744299e26e8d38cb6587b933f9fc.tar.gz | |
Merge branch 'et/add-chmod-x' into maint
"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)) |