diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-02-06 22:05:30 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-02-06 22:05:31 -0800 |
| commit | 9293bf6f2ee047596d31010520a62f0559cc6097 (patch) | |
| tree | e42e1701f17e66bd420e23add8a233638bcb3c9f | |
| parent | Merge branch 'rj/sparse-flags' (diff) | |
| parent | add_to_index(): convert forgotten HASH_RENORMALIZE check (diff) | |
| download | git-9293bf6f2ee047596d31010520a62f0559cc6097.tar.gz git-9293bf6f2ee047596d31010520a62f0559cc6097.zip | |
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
| -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 a66c87bc7a..0e0c93edc9 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 && |