diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2015-01-17 22:47:03 -0600 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2015-02-14 09:25:35 -0500 |
| commit | 8639ea5f98ac53e532820e8a186f8a1d6d98f573 (patch) | |
| tree | 938c73c06ba68294a7d7156acb11a5a5c5342d9f /src/checkout.c | |
| parent | 55798fd1536f055fc23a760c41d679fc60cd2ead (diff) | |
| download | libgit2-8639ea5f98ac53e532820e8a186f8a1d6d98f573.tar.gz | |
checkout: introduce GIT_CHECKOUT_DONT_WRITE_INDEX
Diffstat (limited to 'src/checkout.c')
| -rw-r--r-- | src/checkout.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/checkout.c b/src/checkout.c index 3f65a9ed7..395384030 100644 --- a/src/checkout.c +++ b/src/checkout.c @@ -2375,6 +2375,9 @@ cleanup: return error; } +#define CHECKOUT_INDEX_DONT_WRITE_MASK \ + (GIT_CHECKOUT_DONT_UPDATE_INDEX | GIT_CHECKOUT_DONT_WRITE_INDEX) + int git_checkout_iterator( git_iterator *target, git_index *index, @@ -2481,7 +2484,7 @@ int git_checkout_iterator( cleanup: if (!error && data.index != NULL && - (data.strategy & GIT_CHECKOUT_DONT_UPDATE_INDEX) == 0) + (data.strategy & CHECKOUT_INDEX_DONT_WRITE_MASK) == 0) error = git_index_write(data.index); git_diff_free(data.diff); |