Skip to content

G
git2
Commit 6598aa7e by John Fultz
Options

Oops...need bitwise, not logical negation.

parent 67db2bde
Showing with 2 additions and 2 deletions
src/checkout.c
...@@ -1796,7 +1796,7 @@ static int checkout_create_the_new( ...@@ -1796,7 +1796,7 @@ static int checkout_create_the_new(
size_t i; size_t i;
int caps = git_index_caps(data->index); int caps = git_index_caps(data->index);
git_index_set_caps(data->index, caps & !GIT_INDEXCAP_NO_FILEMODE); git_index_set_caps(data->index, caps & ~GIT_INDEXCAP_NO_FILEMODE);
git_vector_foreach(&data->diff->deltas, i, delta) { git_vector_foreach(&data->diff->deltas, i, delta) {
if (actions[i] & CHECKOUT_ACTION__DEFER_REMOVE) { if (actions[i] & CHECKOUT_ACTION__DEFER_REMOVE) {
...@@ -2550,7 +2550,7 @@ cleanup: ...@@ -2550,7 +2550,7 @@ cleanup:
(data.strategy & CHECKOUT_INDEX_DONT_WRITE_MASK) == 0) (data.strategy & CHECKOUT_INDEX_DONT_WRITE_MASK) == 0)
{ {
int caps = git_index_caps(data.index); int caps = git_index_caps(data.index);
git_index_set_caps(data.index, caps & !GIT_INDEXCAP_NO_FILEMODE); git_index_set_caps(data.index, caps & ~GIT_INDEXCAP_NO_FILEMODE);
error = git_index_write(data.index); error = git_index_write(data.index);
git_index_set_caps(data.index, caps); git_index_set_caps(data.index, caps);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment