diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-02-05 22:26:13 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-02-05 22:26:13 (GMT) |
| commit | 1c418243a525328b7261ba2c1f2cd93fd52191a2 (patch) | |
| tree | 89da5642eb0aa051a1508c5b3f0a7a3b6d42cf31 /cache.h | |
| parent | f5dd919064c30fb8f22f022455eeaf975eff57c6 (diff) | |
| parent | 9e5da3d055c558fc6492d3b996736ff7e8d115c3 (diff) | |
| download | git-1c418243a525328b7261ba2c1f2cd93fd52191a2.zip git-1c418243a525328b7261ba2c1f2cd93fd52191a2.tar.gz git-1c418243a525328b7261ba2c1f2cd93fd52191a2.tar.bz2 | |
Merge branch 'jk/add-ignore-errors-bit-assignment-fix'
"git add --ignore-errors" did not work as advertised and instead
worked as an unintended synonym for "git add --renormalize", which
has been fixed.
* jk/add-ignore-errors-bit-assignment-fix:
add: use separate ADD_CACHE_RENORMALIZE flag
Diffstat (limited to 'cache.h')
| -rw-r--r-- | cache.h | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -755,6 +755,7 @@ extern int index_name_pos(const struct index_state *, const char *name, int name #define ADD_CACHE_JUST_APPEND 8 /* Append only; tree.c::read_tree() */ #define ADD_CACHE_NEW_ONLY 16 /* Do not replace existing ones */ #define ADD_CACHE_KEEP_CACHE_TREE 32 /* Do not invalidate cache-tree */ +#define ADD_CACHE_RENORMALIZE 64 /* Pass along HASH_RENORMALIZE */ extern int add_index_entry(struct index_state *, struct cache_entry *ce, int option); extern void rename_index_entry_at(struct index_state *, int pos, const char *new_name); |