diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-02-07 09:05:22 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-02-07 09:05:23 +0300 |
commit | 7589e63648bf5224e186990931b1491f36e10a4b (patch) | |
tree | dfd3004e735b69ae91dc08ac4f742f1cb84eae5d /sequencer.h | |
parent | e52c6bbd131f1f4f17b95e28d12ead0c81a8e890 (diff) | |
parent | f8adbec9feaa7a1ab9814db1115826e87033712e (diff) |
Merge branch 'nd/the-index-final'
The assumption to work on the single "in-core index" instance has
been reduced from the library-ish part of the codebase.
* nd/the-index-final:
cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch
read-cache.c: remove the_* from index_has_changes()
merge-recursive.c: remove implicit dependency on the_repository
merge-recursive.c: remove implicit dependency on the_index
sha1-name.c: remove implicit dependency on the_index
read-cache.c: replace update_index_if_able with repo_&
read-cache.c: kill read_index()
checkout: avoid the_index when possible
repository.c: replace hold_locked_index() with repo_hold_locked_index()
notes-utils.c: remove the_repository references
grep: use grep_opt->repo instead of explict repo argument
Diffstat (limited to 'sequencer.h')
-rw-r--r-- | sequencer.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sequencer.h b/sequencer.h index 53b8679718..93e891309b 100644 --- a/sequencer.h +++ b/sequencer.h @@ -126,7 +126,8 @@ int update_head_with_reflog(const struct commit *old_head, const struct object_id *new_head, const char *action, const struct strbuf *msg, struct strbuf *err); -void commit_post_rewrite(const struct commit *current_head, +void commit_post_rewrite(struct repository *r, + const struct commit *current_head, const struct object_id *new_head); int prepare_branch_to_be_rebased(struct replay_opts *opts, const char *commit); |