diff options
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/am.c | 2 | ||||
| -rw-r--r-- | builtin/rebase--interactive.c | 2 | ||||
| -rw-r--r-- | builtin/rebase.c | 4 | ||||
| -rw-r--r-- | builtin/rerere.c | 10 |
4 files changed, 10 insertions, 8 deletions
diff --git a/builtin/am.c b/builtin/am.c index 232f3962d7..f0eeec82a9 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -2033,7 +2033,7 @@ static int clean_index(const struct object_id *head, const struct object_id *rem static void am_rerere_clear(void) { struct string_list merge_rr = STRING_LIST_INIT_DUP; - rerere_clear(&merge_rr); + rerere_clear(the_repository, &merge_rr); string_list_clear(&merge_rr, 1); } diff --git a/builtin/rebase--interactive.c b/builtin/rebase--interactive.c index d867050fd2..bd7d39e2af 100644 --- a/builtin/rebase--interactive.c +++ b/builtin/rebase--interactive.c @@ -233,7 +233,7 @@ int cmd_rebase__interactive(int argc, const char **argv, const char *prefix) case SKIP: { struct string_list merge_rr = STRING_LIST_INIT_DUP; - rerere_clear(&merge_rr); + rerere_clear(the_repository, &merge_rr); /* fallthrough */ case CONTINUE: ret = sequencer_continue(the_repository, &opts); 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)) diff --git a/builtin/rerere.c b/builtin/rerere.c index e89ccbc524..6f28c19b20 100644 --- a/builtin/rerere.c +++ b/builtin/rerere.c @@ -82,11 +82,12 @@ int cmd_rerere(int argc, const char **argv, const char *prefix) } if (!strcmp(argv[0], "clear")) { - rerere_clear(&merge_rr); + rerere_clear(the_repository, &merge_rr); } else if (!strcmp(argv[0], "gc")) - rerere_gc(&merge_rr); + rerere_gc(the_repository, &merge_rr); else if (!strcmp(argv[0], "status")) { - if (setup_rerere(&merge_rr, flags | RERERE_READONLY) < 0) + if (setup_rerere(the_repository, &merge_rr, + flags | RERERE_READONLY) < 0) return 0; for (i = 0; i < merge_rr.nr; i++) printf("%s\n", merge_rr.items[i].string); @@ -101,7 +102,8 @@ int cmd_rerere(int argc, const char **argv, const char *prefix) merge_rr.items[i].util = NULL; } } else if (!strcmp(argv[0], "diff")) { - if (setup_rerere(&merge_rr, flags | RERERE_READONLY) < 0) + if (setup_rerere(the_repository, &merge_rr, + flags | RERERE_READONLY) < 0) return 0; for (i = 0; i < merge_rr.nr; i++) { const char *path = merge_rr.items[i].string; |