Merge branch 'jk/add-ignore-errors-bit-assignment-fix'

gitster · gitster · commit 9293bf6f2ee0 · 2019-02-06T22:05:31.000-08:00
A hotfix to an incomplete fix made earlier.

* jk/add-ignore-errors-bit-assignment-fix:
  add_to_index(): convert forgotten HASH_RENORMALIZE check
diff --git 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 &&

Original file line number	Diff line number	Diff line change
`@@ -744,7 +744,7 @@ int add_to_index(struct index_state istate, const char path, struct stat *st,`
`744`	`744`	`if (ignore_case) {`
`745`	`745`	`adjust_dirname_case(istate, ce->name);`
`746`	`746`	`}`
`747`		`- if (!(flags & HASH_RENORMALIZE)) {`
	`747`	`+ if (!(flags & ADD_CACHE_RENORMALIZE)) {`
`748`	`748`	`alias = index_file_exists(istate, ce->name,`
`749`	`749`	`ce_namelen(ce), ignore_case);`
`750`	`750`	`if (alias &&`