diff options
| author |  Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-11-10 06:49:00 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-11-12 14:50:06 +0900 |
| commit | 4edce1729a257ec9a420ff108e3b832b14d113c5 (patch) | |
| tree | 2817074b84529ad92894041c1db4cadc3f95e2cd /builtin | |
| parent | bisect.c: remove the_repository reference (diff) | |
| download | tgif-4edce1729a257ec9a420ff108e3b832b14d113c5.tar.xz | |
branch.c: remove the_repository reference
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')
| -rw-r--r-- | builtin/am.c | 2 | ||||
| -rw-r--r-- | builtin/branch.c | 6 | ||||
| -rw-r--r-- | builtin/checkout.c | 5 | ||||
| -rw-r--r-- | builtin/reset.c | 2 | ||||
| -rw-r--r-- | builtin/revert.c | 2 |
5 files changed, 10 insertions, 7 deletions
diff --git a/builtin/am.c b/builtin/am.c index 3ee9a9d2a9..232f3962d7 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -2022,7 +2022,7 @@ static int clean_index(const struct object_id *head, const struct object_id *rem if (merge_tree(remote_tree)) return -1; - remove_branch_state(); + remove_branch_state(the_repository); return 0; } diff --git a/builtin/branch.c b/builtin/branch.c index 0c55f7f065..1be727209b 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -783,7 +783,8 @@ int cmd_branch(int argc, const char **argv, const char *prefix) * create_branch takes care of setting up the tracking * info and making sure new_upstream is correct */ - create_branch(branch->name, new_upstream, 0, 0, 0, quiet, BRANCH_TRACK_OVERRIDE); + create_branch(the_repository, branch->name, new_upstream, + 0, 0, 0, quiet, BRANCH_TRACK_OVERRIDE); } else if (unset_upstream) { struct branch *branch = branch_get(argv[0]); struct strbuf buf = STRBUF_INIT; @@ -814,7 +815,8 @@ int cmd_branch(int argc, const char **argv, const char *prefix) if (track == BRANCH_TRACK_OVERRIDE) die(_("the '--set-upstream' option is no longer supported. Please use '--track' or '--set-upstream-to' instead.")); - create_branch(argv[0], (argc == 2) ? argv[1] : head, + create_branch(the_repository, + argv[0], (argc == 2) ? argv[1] : head, force, 0, reflog, quiet, track); } else diff --git a/builtin/checkout.c b/builtin/checkout.c index acdafc6e4c..169e797675 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -753,7 +753,8 @@ static void update_refs_for_switch(const struct checkout_opts *opts, free(refname); } else - create_branch(opts->new_branch, new_branch_info->name, + create_branch(the_repository, + opts->new_branch, new_branch_info->name, opts->new_branch_force ? 1 : 0, opts->new_branch_force ? 1 : 0, opts->new_branch_log, @@ -811,7 +812,7 @@ static void update_refs_for_switch(const struct checkout_opts *opts, delete_reflog(old_branch_info->path); } } - remove_branch_state(); + remove_branch_state(the_repository); strbuf_release(&msg); if (!opts->quiet && (new_branch_info->path || (!opts->force_detach && !strcmp(new_branch_info->name, "HEAD")))) diff --git a/builtin/reset.c b/builtin/reset.c index 6d37a35e2e..5b4bbb0fb5 100644 --- a/builtin/reset.c +++ b/builtin/reset.c @@ -400,7 +400,7 @@ int cmd_reset(int argc, const char **argv, const char *prefix) print_new_head_line(lookup_commit_reference(the_repository, &oid)); } if (!pathspec.nr) - remove_branch_state(); + remove_branch_state(the_repository); return update_ref_status; } diff --git a/builtin/revert.c b/builtin/revert.c index 1fa75b2773..df662d4324 100644 --- a/builtin/revert.c +++ b/builtin/revert.c @@ -195,7 +195,7 @@ static int run_sequencer(int argc, const char **argv, struct replay_opts *opts) if (cmd == 'q') { int ret = sequencer_remove_state(opts); if (!ret) - remove_branch_state(); + remove_branch_state(the_repository); return ret; } if (cmd == 'c') |