summaryrefslogtreecommitdiff
path: root/builtin/add.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-02-05 22:26:13 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-02-05 22:26:13 (GMT)
commit1c418243a525328b7261ba2c1f2cd93fd52191a2 (patch)
tree89da5642eb0aa051a1508c5b3f0a7a3b6d42cf31 /builtin/add.c
parentf5dd919064c30fb8f22f022455eeaf975eff57c6 (diff)
parent9e5da3d055c558fc6492d3b996736ff7e8d115c3 (diff)
downloadgit-1c418243a525328b7261ba2c1f2cd93fd52191a2.zip
git-1c418243a525328b7261ba2c1f2cd93fd52191a2.tar.gz
git-1c418243a525328b7261ba2c1f2cd93fd52191a2.tar.bz2
Merge branch 'jk/add-ignore-errors-bit-assignment-fix'
"git add --ignore-errors" did not work as advertised and instead worked as an unintended synonym for "git add --renormalize", which has been fixed. * jk/add-ignore-errors-bit-assignment-fix: add: use separate ADD_CACHE_RENORMALIZE flag
Diffstat (limited to 'builtin/add.c')
-rw-r--r--builtin/add.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/add.c b/builtin/add.c
index d461ba0..7c2a7c5 100644
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -137,7 +137,7 @@ static int renormalize_tracked_files(const struct pathspec *pathspec, int flags)
continue; /* do not touch non blobs */
if (pathspec && !ce_path_match(&the_index, ce, pathspec, NULL))
continue;
- retval |= add_file_to_cache(ce->name, flags | HASH_RENORMALIZE);
+ retval |= add_file_to_cache(ce->name, flags | ADD_CACHE_RENORMALIZE);
}
return retval;