diff options
| author |  Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-11-10 06:49:09 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-11-12 14:50:06 +0900 |
| commit | 55e6b3547d4a678e56e3aef16ad3a3c90351325a (patch) | |
| tree | 776fae712750cf145946a3401f6e9156af5a9d0a /builtin/rebase.c | |
| parent | pack-*.c: remove the_repository references (diff) | |
| download | tgif-55e6b3547d4a678e56e3aef16ad3a3c90351325a.tar.xz | |
rerere.c: remove the_repository references
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 'builtin/rebase.c')
| -rw-r--r-- | builtin/rebase.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c index d9bedecf86..bc07d932a5 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -997,7 +997,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) options.action = "skip"; - rerere_clear(&merge_rr); + rerere_clear(the_repository, &merge_rr); string_list_clear(&merge_rr, 1); if (reset_head(NULL, "reset", NULL, 0, NULL, NULL) < 0) @@ -1010,7 +1010,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) struct string_list merge_rr = STRING_LIST_INIT_DUP; options.action = "abort"; - rerere_clear(&merge_rr); + rerere_clear(the_repository, &merge_rr); string_list_clear(&merge_rr, 1); if (read_basic_state(&options)) |