diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-09-26 16:09:20 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-09-26 16:09:20 -0700 |
| commit | ebc63580a1287325eef85e96c436de494406fd0a (patch) | |
| tree | 16f8b85f47ff2f47b1eaba5b55902196590ed7f1 /builtin/checkout.c | |
| parent | 6a67695268562f67babdb7d5195c8a43cc4015fa (diff) | |
| parent | 40e0dc17ce6f8b699c0f9426438362ed658293dc (diff) | |
| download | git-ebc63580a1287325eef85e96c436de494406fd0a.tar.gz | |
Merge branch 'tg/add-chmod+x-fix'
"git add --chmod=+x <pathspec>" added recently only toggled the
executable bit for paths that are either new or modified. This has
been corrected to flip the executable bit for all paths that match
the given pathspec.
* tg/add-chmod+x-fix:
t3700-add: do not check working tree file mode without POSIXPERM
t3700-add: create subdirectory gently
add: modify already added files when --chmod is given
read-cache: introduce chmod_index_entry
update-index: add test for chmod flags
Diffstat (limited to 'builtin/checkout.c')
| -rw-r--r-- | builtin/checkout.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c index efbda8e63b..f4b24a432a 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -548,7 +548,7 @@ static int merge_working_tree(const struct checkout_opts *opts, * entries in the index. */ - add_files_to_cache(NULL, NULL, 0, 0); + add_files_to_cache(NULL, NULL, 0); /* * NEEDSWORK: carrying over local changes * when branches have different end-of-line |