diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-11-28 12:13:46 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-11-28 12:13:46 +0900 |
| commit | 041df69edd393204c220f3f39d217e284258fd18 (patch) | |
| tree | 20760c6a0bcbbec48fcc4a05d8d245581d570e91 /add-patch.c | |
| parent | 613999cc5c951bc2c078caad59e339243f119a6e (diff) | |
| parent | 07047d68294769d5e8700fc200ac326a21d04f8e (diff) | |
| download | git-041df69edd393204c220f3f39d217e284258fd18.tar.gz | |
Merge branch 'ab/fewer-the-index-macros'
Progress on removing 'the_index' convenience wrappers.
* ab/fewer-the-index-macros:
cocci: apply "pending" index-compatibility to some "builtin/*.c"
cache.h & test-tool.h: add & use "USE_THE_INDEX_VARIABLE"
{builtin/*,repository}.c: add & use "USE_THE_INDEX_VARIABLE"
cocci: apply "pending" index-compatibility to "t/helper/*.c"
cocci & cache.h: apply variable section of "pending" index-compatibility
cocci & cache.h: apply a selection of "pending" index-compatibility
cocci: add a index-compatibility.pending.cocci
read-cache API & users: make discard_index() return void
cocci & cache.h: remove rarely used "the_index" compat macros
builtin/{grep,log}.: don't define "USE_THE_INDEX_COMPATIBILITY_MACROS"
cache.h: remove unused "the_index" compat macros
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) || |