diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2019-06-27 11:28:52 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-06-27 21:45:17 +0200 |
| commit | 34e7771bc64475d71430c20937f6828675ebccdb (patch) | |
| tree | 9e8d674ecfcc2d08334cb79354781d63a30c9864 /sequencer.c | |
| parent | match-trees.c: remove the_repo from shift_tree*() (diff) | |
| download | git-34e7771bc64475d71430c20937f6828675ebccdb.tar.xz git-34e7771bc64475d71430c20937f6828675ebccdb.zip | |
Use the right 'struct repository' instead of the_repository
There are a couple of places where 'struct repository' is already passed
around, but the_repository is still used. Use the right repo.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sequencer.c')
| -rw-r--r-- | sequencer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sequencer.c b/sequencer.c index d565fcf2b1..64428ac28f 100644 --- a/sequencer.c +++ b/sequencer.c @@ -3733,7 +3733,7 @@ static int pick_commits(struct repository *r, unlink(rebase_path_author_script()); unlink(rebase_path_stopped_sha()); unlink(rebase_path_amend()); - unlink(git_path_merge_head(the_repository)); + unlink(git_path_merge_head(r)); delete_ref(NULL, "REBASE_HEAD", NULL, REF_NO_DEREF); if (item->command == TODO_BREAK) @@ -4107,7 +4107,7 @@ static int commit_staged_changes(struct repository *r, opts, flags)) return error(_("could not commit staged changes.")); unlink(rebase_path_amend()); - unlink(git_path_merge_head(the_repository)); + unlink(git_path_merge_head(r)); if (final_fixup) { unlink(rebase_path_fixup_msg()); unlink(rebase_path_squash_msg()); |