diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2022-11-19 14:07:31 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-11-21 04:06:15 +0100 |
| commit | 9c5f3ee3b3a04182cc22630e9eb9fad95bd57fd7 (patch) | |
| tree | c31a4d9625a82b1ede09040d520fb5ef1a6f37c1 /add-patch.c | |
| parent | cocci & cache.h: remove rarely used "the_index" compat macros (diff) | |
| download | git-9c5f3ee3b3a04182cc22630e9eb9fad95bd57fd7.tar.xz git-9c5f3ee3b3a04182cc22630e9eb9fad95bd57fd7.zip | |
read-cache API & users: make discard_index() return void
The discard_index() function has not returned non-zero since
7a51ed66f65 (Make on-disk index representation separate from in-core
one, 2008-01-14), but we've had various code in-tree still acting as
though that might be the case.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'add-patch.c')
| -rw-r--r-- | add-patch.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/add-patch.c b/add-patch.c index 33ecd8398a..a86a92e164 100644 --- a/add-patch.c +++ b/add-patch.c @@ -1750,7 +1750,8 @@ int run_add_p(struct repository *r, enum add_p_mode mode, s.mode = &patch_mode_add; s.revision = revision; - if (discard_index(r->index) < 0 || repo_read_index(r) < 0 || + discard_index(r->index); + if (repo_read_index(r) < 0 || (!s.mode->index_only && repo_refresh_and_write_index(r, REFRESH_QUIET, 0, 1, NULL, NULL, NULL) < 0) || |