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
This commit is contained in:
commit
9293bf6f2e
@ -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 &&
|
||||
|
Loading…
Reference in New Issue
Block a user