diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-11-29 21:28:02 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-11-29 21:28:02 (GMT) |
| commit | af8d6a9821d79f18c8b645582b5b5d251066ae2f (patch) | |
| tree | 0001cb05252fa0c6211a63a437f23f70406973d3 /builtin | |
| parent | 797d1a4672c67ed4e560c67c5d1fe208e31f0b47 (diff) | |
| parent | 4bd488ea7c56b673947b07511d26f2afc4ec0bd6 (diff) | |
| download | git-af8d6a9821d79f18c8b645582b5b5d251066ae2f.zip git-af8d6a9821d79f18c8b645582b5b5d251066ae2f.tar.gz git-af8d6a9821d79f18c8b645582b5b5d251066ae2f.tar.bz2 | |
Merge branch 'jk/create-branch-remove-unused-param' into maint
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 7df0543..6810c3a 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 32cf317..899bd8d 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -631,7 +631,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, |