diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-02-05 14:26:13 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-02-05 14:26:13 -0800 |
| commit | 1c418243a525328b7261ba2c1f2cd93fd52191a2 (patch) | |
| tree | 89da5642eb0aa051a1508c5b3f0a7a3b6d42cf31 /builtin | |
| parent | Merge branch 'js/mingw-unc-path-w-backslashes' (diff) | |
| parent | add: use separate ADD_CACHE_RENORMALIZE flag (diff) | |
| download | tgif-1c418243a525328b7261ba2c1f2cd93fd52191a2.tar.xz | |
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')
| -rw-r--r-- | builtin/add.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/add.c b/builtin/add.c index d461ba08b9..7c2a7c5a4d 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; |