|
|
@ -807,7 +807,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix) |
|
|
|
* create_branch takes care of setting up the tracking |
|
|
|
* create_branch takes care of setting up the tracking |
|
|
|
* info and making sure new_upstream is correct |
|
|
|
* 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) { |
|
|
|
} else if (unset_upstream) { |
|
|
|
struct branch *branch = branch_get(argv[0]); |
|
|
|
struct branch *branch = branch_get(argv[0]); |
|
|
|
struct strbuf buf = STRBUF_INIT; |
|
|
|
struct strbuf buf = STRBUF_INIT; |
|
|
@ -853,7 +853,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix) |
|
|
|
strbuf_release(&buf); |
|
|
|
strbuf_release(&buf); |
|
|
|
|
|
|
|
|
|
|
|
branch_existed = ref_exists(branch->refname); |
|
|
|
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); |
|
|
|
force, reflog, 0, quiet, track); |
|
|
|
|
|
|
|
|
|
|
|
/* |
|
|
|
/* |
|
|
|