diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-11-17 13:45:21 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-11-17 13:45:21 -0800 |
| commit | 6846e8734d3c9e4d6cbe8a8ba27dae414aa5aff1 (patch) | |
| tree | 32c2d6d60e2bce72ccdd460138cefabffaa31366 /builtin | |
| parent | Merge branch 'nd/worktree-lock' (diff) | |
| parent | create_branch: drop unused "head" parameter (diff) | |
| download | tgif-6846e8734d3c9e4d6cbe8a8ba27dae414aa5aff1.tar.xz | |
Merge branch 'jk/create-branch-remove-unused-param'
Code clean-up.
* jk/create-branch-remove-unused-param:
create_branch: drop unused "head" parameter
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/branch.c | 4 | ||||
| -rw-r--r-- | builtin/checkout.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/builtin/branch.c b/builtin/branch.c index d5d93a8c03..60cc5c8e8d 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -807,7 +807,7 @@ 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(head, branch->name, new_upstream, 0, 0, 0, quiet, BRANCH_TRACK_OVERRIDE); + create_branch(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; @@ -853,7 +853,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix) strbuf_release(&buf); branch_existed = ref_exists(branch->refname); - create_branch(head, argv[0], (argc == 2) ? argv[1] : head, + create_branch(argv[0], (argc == 2) ? argv[1] : head, force, reflog, 0, quiet, track); /* diff --git a/builtin/checkout.c b/builtin/checkout.c index 9b2a5b31d4..512492aad9 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -630,7 +630,7 @@ static void update_refs_for_switch(const struct checkout_opts *opts, } } else - create_branch(old->name, opts->new_branch, new->name, + create_branch(opts->new_branch, new->name, opts->new_branch_force ? 1 : 0, opts->new_branch_log, opts->new_branch_force ? 1 : 0, |