Skip to content

Commit

Permalink
Merge branch 'jk/add-ignore-errors-bit-assignment-fix'
Browse files Browse the repository at this point in the history
A hotfix to an incomplete fix made earlier.

* jk/add-ignore-errors-bit-assignment-fix:
  add_to_index(): convert forgotten HASH_RENORMALIZE check
  • Loading branch information
gitster committed Feb 7, 2019
2 parents fe8e686 + e2c2a37 commit 9293bf6
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion read-cache.c
Expand Up @@ -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 &&
Expand Down

0 comments on commit 9293bf6

Please sign in to comment.