diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-02-07 06:05:30 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-02-07 06:05:31 (GMT) |
| commit | 9293bf6f2ee047596d31010520a62f0559cc6097 (patch) | |
| tree | e42e1701f17e66bd420e23add8a233638bcb3c9f /read-cache.c | |
| parent | fe8e68659d4d9220e15cd9019ef2153f08db4792 (diff) | |
| parent | e2c2a37545f604988424100ed6b1732eb5f36b55 (diff) | |
| download | git-9293bf6f2ee047596d31010520a62f0559cc6097.zip git-9293bf6f2ee047596d31010520a62f0559cc6097.tar.gz git-9293bf6f2ee047596d31010520a62f0559cc6097.tar.bz2 | |
Merge branch 'jk/add-ignore-errors-bit-assignment-fix'
A hotfix to an incomplete fix made earlier.
* jk/add-ignore-errors-bit-assignment-fix:
add_to_index(): convert forgotten HASH_RENORMALIZE check
Diffstat (limited to 'read-cache.c')
| -rw-r--r-- | read-cache.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/read-cache.c b/read-cache.c index a66c87b..0e0c93e 100644 --- a/read-cache.c +++ b/read-cache.c @@ -744,7 +744,7 @@ int add_to_index(struct index_state *istate, const char *path, struct stat *st, if (ignore_case) { adjust_dirname_case(istate, ce->name); } - if (!(flags & HASH_RENORMALIZE)) { + if (!(flags & ADD_CACHE_RENORMALIZE)) { alias = index_file_exists(istate, ce->name, ce_namelen(ce), ignore_case); if (alias && |