4 * Copyright (c) 2006 Kristian Høgsberg <krh@redhat.com>
5 * Based on git-branch.sh by Junio C Hamano.
15 #include "parse-options.h"
19 #include "string-list.h"
22 #include "wt-status.h"
23 #include "ref-filter.h"
27 static const char * const builtin_branch_usage
[] = {
28 N_("git branch [<options>] [-r | -a] [--merged | --no-merged]"),
29 N_("git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"),
30 N_("git branch [<options>] [-r] (-d | -D) <branch-name>..."),
31 N_("git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"),
32 N_("git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"),
33 N_("git branch [<options>] [-r | -a] [--points-at]"),
34 N_("git branch [<options>] [-r | -a] [--format]"),
38 static const char *head
;
39 static struct object_id head_oid
;
41 static int branch_use_color
= -1;
42 static char branch_colors
[][COLOR_MAXLEN
] = {
44 GIT_COLOR_NORMAL
, /* PLAIN */
45 GIT_COLOR_RED
, /* REMOTE */
46 GIT_COLOR_NORMAL
, /* LOCAL */
47 GIT_COLOR_GREEN
, /* CURRENT */
48 GIT_COLOR_BLUE
, /* UPSTREAM */
51 BRANCH_COLOR_RESET
= 0,
52 BRANCH_COLOR_PLAIN
= 1,
53 BRANCH_COLOR_REMOTE
= 2,
54 BRANCH_COLOR_LOCAL
= 3,
55 BRANCH_COLOR_CURRENT
= 4,
56 BRANCH_COLOR_UPSTREAM
= 5
59 static const char *color_branch_slots
[] = {
60 [BRANCH_COLOR_RESET
] = "reset",
61 [BRANCH_COLOR_PLAIN
] = "plain",
62 [BRANCH_COLOR_REMOTE
] = "remote",
63 [BRANCH_COLOR_LOCAL
] = "local",
64 [BRANCH_COLOR_CURRENT
] = "current",
65 [BRANCH_COLOR_UPSTREAM
] = "upstream",
68 static struct string_list output
= STRING_LIST_INIT_DUP
;
69 static unsigned int colopts
;
71 define_list_config_array(color_branch_slots
);
73 static int git_branch_config(const char *var
, const char *value
, void *cb
)
75 const char *slot_name
;
77 if (starts_with(var
, "column."))
78 return git_column_config(var
, value
, "branch", &colopts
);
79 if (!strcmp(var
, "color.branch")) {
80 branch_use_color
= git_config_colorbool(var
, value
);
83 if (skip_prefix(var
, "color.branch.", &slot_name
)) {
84 int slot
= LOOKUP_CONFIG(color_branch_slots
, slot_name
);
88 return config_error_nonbool(var
);
89 return color_parse(value
, branch_colors
[slot
]);
91 return git_color_default_config(var
, value
, cb
);
94 static const char *branch_get_color(enum color_branch ix
)
96 if (want_color(branch_use_color
))
97 return branch_colors
[ix
];
101 static int branch_merged(int kind
, const char *name
,
102 struct commit
*rev
, struct commit
*head_rev
)
105 * This checks whether the merge bases of branch and HEAD (or
106 * the other branch this branch builds upon) contains the
107 * branch, which means that the branch has already been merged
108 * safely to HEAD (or the other branch).
110 struct commit
*reference_rev
= NULL
;
111 const char *reference_name
= NULL
;
112 void *reference_name_to_free
= NULL
;
115 if (kind
== FILTER_REFS_BRANCHES
) {
116 struct branch
*branch
= branch_get(name
);
117 const char *upstream
= branch_get_upstream(branch
, NULL
);
118 struct object_id oid
;
121 (reference_name
= reference_name_to_free
=
122 resolve_refdup(upstream
, RESOLVE_REF_READING
,
123 &oid
, NULL
)) != NULL
)
124 reference_rev
= lookup_commit_reference(the_repository
,
128 reference_rev
= head_rev
;
130 merged
= in_merge_bases(rev
, reference_rev
);
133 * After the safety valve is fully redefined to "check with
134 * upstream, if any, otherwise with HEAD", we should just
135 * return the result of the in_merge_bases() above without
136 * any of the following code, but during the transition period,
137 * a gentle reminder is in order.
139 if ((head_rev
!= reference_rev
) &&
140 in_merge_bases(rev
, head_rev
) != merged
) {
142 warning(_("deleting branch '%s' that has been merged to\n"
143 " '%s', but not yet merged to HEAD."),
144 name
, reference_name
);
146 warning(_("not deleting branch '%s' that is not yet merged to\n"
147 " '%s', even though it is merged to HEAD."),
148 name
, reference_name
);
150 free(reference_name_to_free
);
154 static int check_branch_commit(const char *branchname
, const char *refname
,
155 const struct object_id
*oid
, struct commit
*head_rev
,
156 int kinds
, int force
)
158 struct commit
*rev
= lookup_commit_reference(the_repository
, oid
);
160 error(_("Couldn't look up commit object for '%s'"), refname
);
163 if (!force
&& !branch_merged(kinds
, branchname
, rev
, head_rev
)) {
164 error(_("The branch '%s' is not fully merged.\n"
165 "If you are sure you want to delete it, "
166 "run 'git branch -D %s'."), branchname
, branchname
);
172 static void delete_branch_config(const char *branchname
)
174 struct strbuf buf
= STRBUF_INIT
;
175 strbuf_addf(&buf
, "branch.%s", branchname
);
176 if (git_config_rename_section(buf
.buf
, NULL
) < 0)
177 warning(_("Update of config-file failed"));
178 strbuf_release(&buf
);
181 static int delete_branches(int argc
, const char **argv
, int force
, int kinds
,
184 struct commit
*head_rev
= NULL
;
185 struct object_id oid
;
190 int remote_branch
= 0;
191 struct strbuf bname
= STRBUF_INIT
;
192 unsigned allowed_interpret
;
195 case FILTER_REFS_REMOTES
:
196 fmt
= "refs/remotes/%s";
197 /* For subsequent UI messages */
199 allowed_interpret
= INTERPRET_BRANCH_REMOTE
;
203 case FILTER_REFS_BRANCHES
:
204 fmt
= "refs/heads/%s";
205 allowed_interpret
= INTERPRET_BRANCH_LOCAL
;
208 die(_("cannot use -a with -d"));
212 head_rev
= lookup_commit_reference(the_repository
, &head_oid
);
214 die(_("Couldn't look up commit object for HEAD"));
216 for (i
= 0; i
< argc
; i
++, strbuf_reset(&bname
)) {
220 strbuf_branchname(&bname
, argv
[i
], allowed_interpret
);
222 name
= mkpathdup(fmt
, bname
.buf
);
224 if (kinds
== FILTER_REFS_BRANCHES
) {
225 const struct worktree
*wt
=
226 find_shared_symref("HEAD", name
);
228 error(_("Cannot delete branch '%s' "
229 "checked out at '%s'"),
230 bname
.buf
, wt
->path
);
236 target
= resolve_refdup(name
,
238 | RESOLVE_REF_NO_RECURSE
239 | RESOLVE_REF_ALLOW_BAD_NAME
,
243 ? _("remote-tracking branch '%s' not found.")
244 : _("branch '%s' not found."), bname
.buf
);
249 if (!(flags
& (REF_ISSYMREF
|REF_ISBROKEN
)) &&
250 check_branch_commit(bname
.buf
, name
, &oid
, head_rev
, kinds
,
256 if (delete_ref(NULL
, name
, is_null_oid(&oid
) ? NULL
: &oid
,
259 ? _("Error deleting remote-tracking branch '%s'")
260 : _("Error deleting branch '%s'"),
267 ? _("Deleted remote-tracking branch %s (was %s).\n")
268 : _("Deleted branch %s (was %s).\n"),
270 (flags
& REF_ISBROKEN
) ? "broken"
271 : (flags
& REF_ISSYMREF
) ? target
272 : find_unique_abbrev(&oid
, DEFAULT_ABBREV
));
274 delete_branch_config(bname
.buf
);
281 strbuf_release(&bname
);
286 static int calc_maxwidth(struct ref_array
*refs
, int remote_bonus
)
289 for (i
= 0; i
< refs
->nr
; i
++) {
290 struct ref_array_item
*it
= refs
->items
[i
];
291 const char *desc
= it
->refname
;
294 skip_prefix(it
->refname
, "refs/heads/", &desc
);
295 skip_prefix(it
->refname
, "refs/remotes/", &desc
);
296 if (it
->kind
== FILTER_REFS_DETACHED_HEAD
) {
297 char *head_desc
= get_head_description();
298 w
= utf8_strwidth(head_desc
);
301 w
= utf8_strwidth(desc
);
303 if (it
->kind
== FILTER_REFS_REMOTES
)
311 static const char *quote_literal_for_format(const char *s
)
313 static struct strbuf buf
= STRBUF_INIT
;
317 const char *ep
= strchrnul(s
, '%');
319 strbuf_add(&buf
, s
, ep
- s
);
321 strbuf_addstr(&buf
, "%%");
330 static char *build_format(struct ref_filter
*filter
, int maxwidth
, const char *remote_prefix
)
332 struct strbuf fmt
= STRBUF_INIT
;
333 struct strbuf local
= STRBUF_INIT
;
334 struct strbuf remote
= STRBUF_INIT
;
336 strbuf_addf(&local
, "%%(if)%%(HEAD)%%(then)* %s%%(else) %s%%(end)",
337 branch_get_color(BRANCH_COLOR_CURRENT
),
338 branch_get_color(BRANCH_COLOR_LOCAL
));
339 strbuf_addf(&remote
, " %s",
340 branch_get_color(BRANCH_COLOR_REMOTE
));
342 if (filter
->verbose
) {
343 struct strbuf obname
= STRBUF_INIT
;
345 if (filter
->abbrev
< 0)
346 strbuf_addf(&obname
, "%%(objectname:short)");
347 else if (!filter
->abbrev
)
348 strbuf_addf(&obname
, "%%(objectname)");
350 strbuf_addf(&obname
, "%%(objectname:short=%d)", filter
->abbrev
);
352 strbuf_addf(&local
, "%%(align:%d,left)%%(refname:lstrip=2)%%(end)", maxwidth
);
353 strbuf_addstr(&local
, branch_get_color(BRANCH_COLOR_RESET
));
354 strbuf_addf(&local
, " %s ", obname
.buf
);
356 if (filter
->verbose
> 1)
357 strbuf_addf(&local
, "%%(if)%%(upstream)%%(then)[%s%%(upstream:short)%s%%(if)%%(upstream:track)"
358 "%%(then): %%(upstream:track,nobracket)%%(end)] %%(end)%%(contents:subject)",
359 branch_get_color(BRANCH_COLOR_UPSTREAM
), branch_get_color(BRANCH_COLOR_RESET
));
361 strbuf_addf(&local
, "%%(if)%%(upstream:track)%%(then)%%(upstream:track) %%(end)%%(contents:subject)");
363 strbuf_addf(&remote
, "%%(align:%d,left)%s%%(refname:lstrip=2)%%(end)%s"
364 "%%(if)%%(symref)%%(then) -> %%(symref:short)"
365 "%%(else) %s %%(contents:subject)%%(end)",
366 maxwidth
, quote_literal_for_format(remote_prefix
),
367 branch_get_color(BRANCH_COLOR_RESET
), obname
.buf
);
368 strbuf_release(&obname
);
370 strbuf_addf(&local
, "%%(refname:lstrip=2)%s%%(if)%%(symref)%%(then) -> %%(symref:short)%%(end)",
371 branch_get_color(BRANCH_COLOR_RESET
));
372 strbuf_addf(&remote
, "%s%%(refname:lstrip=2)%s%%(if)%%(symref)%%(then) -> %%(symref:short)%%(end)",
373 quote_literal_for_format(remote_prefix
),
374 branch_get_color(BRANCH_COLOR_RESET
));
377 strbuf_addf(&fmt
, "%%(if:notequals=refs/remotes)%%(refname:rstrip=-2)%%(then)%s%%(else)%s%%(end)", local
.buf
, remote
.buf
);
379 strbuf_release(&local
);
380 strbuf_release(&remote
);
381 return strbuf_detach(&fmt
, NULL
);
384 static void print_ref_list(struct ref_filter
*filter
, struct ref_sorting
*sorting
, struct ref_format
*format
)
387 struct ref_array array
;
389 const char *remote_prefix
= "";
390 char *to_free
= NULL
;
393 * If we are listing more than just remote branches,
394 * then remote branches will have a "remotes/" prefix.
395 * We need to account for this in the width.
397 if (filter
->kind
!= FILTER_REFS_REMOTES
)
398 remote_prefix
= "remotes/";
400 memset(&array
, 0, sizeof(array
));
402 filter_refs(&array
, filter
, filter
->kind
| FILTER_REFS_INCLUDE_BROKEN
);
405 maxwidth
= calc_maxwidth(&array
, strlen(remote_prefix
));
408 format
->format
= to_free
= build_format(filter
, maxwidth
, remote_prefix
);
409 format
->use_color
= branch_use_color
;
411 if (verify_ref_format(format
))
412 die(_("unable to parse format string"));
414 ref_array_sort(sorting
, &array
);
416 for (i
= 0; i
< array
.nr
; i
++) {
417 struct strbuf out
= STRBUF_INIT
;
418 struct strbuf err
= STRBUF_INIT
;
419 if (format_ref_array_item(array
.items
[i
], format
, &out
, &err
))
421 if (column_active(colopts
)) {
422 assert(!filter
->verbose
&& "--column and --verbose are incompatible");
423 /* format to a string_list to let print_columns() do its job */
424 string_list_append(&output
, out
.buf
);
426 fwrite(out
.buf
, 1, out
.len
, stdout
);
429 strbuf_release(&err
);
430 strbuf_release(&out
);
433 ref_array_clear(&array
);
437 static void reject_rebase_or_bisect_branch(const char *target
)
439 struct worktree
**worktrees
= get_worktrees(0);
442 for (i
= 0; worktrees
[i
]; i
++) {
443 struct worktree
*wt
= worktrees
[i
];
445 if (!wt
->is_detached
)
448 if (is_worktree_being_rebased(wt
, target
))
449 die(_("Branch %s is being rebased at %s"),
452 if (is_worktree_being_bisected(wt
, target
))
453 die(_("Branch %s is being bisected at %s"),
457 free_worktrees(worktrees
);
460 static void copy_or_rename_branch(const char *oldname
, const char *newname
, int copy
, int force
)
462 struct strbuf oldref
= STRBUF_INIT
, newref
= STRBUF_INIT
, logmsg
= STRBUF_INIT
;
463 struct strbuf oldsection
= STRBUF_INIT
, newsection
= STRBUF_INIT
;
464 const char *interpreted_oldname
= NULL
;
465 const char *interpreted_newname
= NULL
;
470 die(_("cannot copy the current branch while not on any."));
472 die(_("cannot rename the current branch while not on any."));
475 if (strbuf_check_branch_ref(&oldref
, oldname
)) {
477 * Bad name --- this could be an attempt to rename a
478 * ref that we used to allow to be created by accident.
480 if (ref_exists(oldref
.buf
))
483 die(_("Invalid branch name: '%s'"), oldname
);
487 * A command like "git branch -M currentbranch currentbranch" cannot
488 * cause the worktree to become inconsistent with HEAD, so allow it.
490 if (!strcmp(oldname
, newname
))
491 validate_branchname(newname
, &newref
);
493 validate_new_branchname(newname
, &newref
, force
);
495 reject_rebase_or_bisect_branch(oldref
.buf
);
497 if (!skip_prefix(oldref
.buf
, "refs/heads/", &interpreted_oldname
) ||
498 !skip_prefix(newref
.buf
, "refs/heads/", &interpreted_newname
)) {
499 BUG("expected prefix missing for refs");
503 strbuf_addf(&logmsg
, "Branch: copied %s to %s",
504 oldref
.buf
, newref
.buf
);
506 strbuf_addf(&logmsg
, "Branch: renamed %s to %s",
507 oldref
.buf
, newref
.buf
);
509 if (!copy
&& rename_ref(oldref
.buf
, newref
.buf
, logmsg
.buf
))
510 die(_("Branch rename failed"));
511 if (copy
&& copy_existing_ref(oldref
.buf
, newref
.buf
, logmsg
.buf
))
512 die(_("Branch copy failed"));
516 warning(_("Created a copy of a misnamed branch '%s'"),
517 interpreted_oldname
);
519 warning(_("Renamed a misnamed branch '%s' away"),
520 interpreted_oldname
);
524 replace_each_worktree_head_symref(oldref
.buf
, newref
.buf
, logmsg
.buf
))
525 die(_("Branch renamed to %s, but HEAD is not updated!"), newname
);
527 strbuf_release(&logmsg
);
529 strbuf_addf(&oldsection
, "branch.%s", interpreted_oldname
);
530 strbuf_release(&oldref
);
531 strbuf_addf(&newsection
, "branch.%s", interpreted_newname
);
532 strbuf_release(&newref
);
533 if (!copy
&& git_config_rename_section(oldsection
.buf
, newsection
.buf
) < 0)
534 die(_("Branch is renamed, but update of config-file failed"));
535 if (copy
&& strcmp(oldname
, newname
) && git_config_copy_section(oldsection
.buf
, newsection
.buf
) < 0)
536 die(_("Branch is copied, but update of config-file failed"));
537 strbuf_release(&oldsection
);
538 strbuf_release(&newsection
);
541 static GIT_PATH_FUNC(edit_description
, "EDIT_DESCRIPTION")
543 static int edit_branch_description(const char *branch_name
)
545 struct strbuf buf
= STRBUF_INIT
;
546 struct strbuf name
= STRBUF_INIT
;
548 read_branch_desc(&buf
, branch_name
);
549 if (!buf
.len
|| buf
.buf
[buf
.len
-1] != '\n')
550 strbuf_addch(&buf
, '\n');
551 strbuf_commented_addf(&buf
,
552 _("Please edit the description for the branch\n"
554 "Lines starting with '%c' will be stripped.\n"),
555 branch_name
, comment_line_char
);
556 write_file_buf(edit_description(), buf
.buf
, buf
.len
);
558 if (launch_editor(edit_description(), &buf
, NULL
)) {
559 strbuf_release(&buf
);
562 strbuf_stripspace(&buf
, 1);
564 strbuf_addf(&name
, "branch.%s.description", branch_name
);
565 git_config_set(name
.buf
, buf
.len
? buf
.buf
: NULL
);
566 strbuf_release(&name
);
567 strbuf_release(&buf
);
572 int cmd_branch(int argc
, const char **argv
, const char *prefix
)
574 int delete = 0, rename
= 0, copy
= 0, force
= 0, list
= 0;
575 int reflog
= 0, edit_description
= 0;
576 int quiet
= 0, unset_upstream
= 0;
577 const char *new_upstream
= NULL
;
578 enum branch_track track
;
579 struct ref_filter filter
;
581 static struct ref_sorting
*sorting
= NULL
, **sorting_tail
= &sorting
;
582 struct ref_format format
= REF_FORMAT_INIT
;
584 struct option options
[] = {
585 OPT_GROUP(N_("Generic options")),
586 OPT__VERBOSE(&filter
.verbose
,
587 N_("show hash and subject, give twice for upstream branch")),
588 OPT__QUIET(&quiet
, N_("suppress informational messages")),
589 OPT_SET_INT('t', "track", &track
, N_("set up tracking mode (see git-pull(1))"),
590 BRANCH_TRACK_EXPLICIT
),
591 OPT_SET_INT_F(0, "set-upstream", &track
, N_("do not use"),
592 BRANCH_TRACK_OVERRIDE
, PARSE_OPT_HIDDEN
),
593 OPT_STRING('u', "set-upstream-to", &new_upstream
, N_("upstream"), N_("change the upstream info")),
594 OPT_BOOL(0, "unset-upstream", &unset_upstream
, N_("Unset the upstream info")),
595 OPT__COLOR(&branch_use_color
, N_("use colored output")),
596 OPT_SET_INT('r', "remotes", &filter
.kind
, N_("act on remote-tracking branches"),
597 FILTER_REFS_REMOTES
),
598 OPT_CONTAINS(&filter
.with_commit
, N_("print only branches that contain the commit")),
599 OPT_NO_CONTAINS(&filter
.no_commit
, N_("print only branches that don't contain the commit")),
600 OPT_WITH(&filter
.with_commit
, N_("print only branches that contain the commit")),
601 OPT_WITHOUT(&filter
.no_commit
, N_("print only branches that don't contain the commit")),
602 OPT__ABBREV(&filter
.abbrev
),
604 OPT_GROUP(N_("Specific git-branch actions:")),
605 OPT_SET_INT('a', "all", &filter
.kind
, N_("list both remote-tracking and local branches"),
606 FILTER_REFS_REMOTES
| FILTER_REFS_BRANCHES
),
607 OPT_BIT('d', "delete", &delete, N_("delete fully merged branch"), 1),
608 OPT_BIT('D', NULL
, &delete, N_("delete branch (even if not merged)"), 2),
609 OPT_BIT('m', "move", &rename
, N_("move/rename a branch and its reflog"), 1),
610 OPT_BIT('M', NULL
, &rename
, N_("move/rename a branch, even if target exists"), 2),
611 OPT_BIT('c', "copy", ©
, N_("copy a branch and its reflog"), 1),
612 OPT_BIT('C', NULL
, ©
, N_("copy a branch, even if target exists"), 2),
613 OPT_BOOL(0, "list", &list
, N_("list branch names")),
614 OPT_BOOL('l', "create-reflog", &reflog
, N_("create the branch's reflog")),
615 OPT_BOOL(0, "edit-description", &edit_description
,
616 N_("edit the description for the branch")),
617 OPT__FORCE(&force
, N_("force creation, move/rename, deletion"), PARSE_OPT_NOCOMPLETE
),
618 OPT_MERGED(&filter
, N_("print only branches that are merged")),
619 OPT_NO_MERGED(&filter
, N_("print only branches that are not merged")),
620 OPT_COLUMN(0, "column", &colopts
, N_("list branches in columns")),
621 OPT_CALLBACK(0 , "sort", sorting_tail
, N_("key"),
622 N_("field name to sort on"), &parse_opt_ref_sorting
),
624 OPTION_CALLBACK
, 0, "points-at", &filter
.points_at
, N_("object"),
625 N_("print only branches of the object"), 0, parse_opt_object_name
627 OPT_BOOL('i', "ignore-case", &icase
, N_("sorting and filtering are case insensitive")),
628 OPT_STRING( 0 , "format", &format
.format
, N_("format"), N_("format to use for the output")),
632 setup_ref_filter_porcelain_msg();
634 memset(&filter
, 0, sizeof(filter
));
635 filter
.kind
= FILTER_REFS_BRANCHES
;
638 if (argc
== 2 && !strcmp(argv
[1], "-h"))
639 usage_with_options(builtin_branch_usage
, options
);
641 git_config(git_branch_config
, NULL
);
643 track
= git_branch_track
;
645 head
= resolve_refdup("HEAD", 0, &head_oid
, NULL
);
647 die(_("Failed to resolve HEAD as a valid ref."));
648 if (!strcmp(head
, "HEAD"))
650 else if (!skip_prefix(head
, "refs/heads/", &head
))
651 die(_("HEAD not found below refs/heads!"));
653 argc
= parse_options(argc
, argv
, prefix
, options
, builtin_branch_usage
,
656 if (!delete && !rename
&& !copy
&& !edit_description
&& !new_upstream
&& !unset_upstream
&& argc
== 0)
659 if (filter
.with_commit
|| filter
.merge
!= REF_FILTER_MERGED_NONE
|| filter
.points_at
.nr
||
663 if (!!delete + !!rename
+ !!copy
+ !!new_upstream
+
664 list
+ unset_upstream
> 1)
665 usage_with_options(builtin_branch_usage
, options
);
667 if (filter
.abbrev
== -1)
668 filter
.abbrev
= DEFAULT_ABBREV
;
669 filter
.ignore_case
= icase
;
671 finalize_colopts(&colopts
, -1);
672 if (filter
.verbose
) {
673 if (explicitly_enable_column(colopts
))
674 die(_("--column and --verbose are incompatible"));
685 setup_auto_pager("branch", 1);
689 die(_("branch name required"));
690 return delete_branches(argc
, argv
, delete > 1, filter
.kind
, quiet
);
692 /* git branch --local also shows HEAD when it is detached */
693 if ((filter
.kind
& FILTER_REFS_BRANCHES
) && filter
.detached
)
694 filter
.kind
|= FILTER_REFS_DETACHED_HEAD
;
695 filter
.name_patterns
= argv
;
697 * If no sorting parameter is given then we default to sorting
698 * by 'refname'. This would give us an alphabetically sorted
699 * array with the 'HEAD' ref at the beginning followed by
700 * local branches 'refs/heads/...' and finally remote-tracking
701 * branches 'refs/remotes/...'.
704 sorting
= ref_default_sorting();
705 sorting
->ignore_case
= icase
;
706 print_ref_list(&filter
, sorting
, &format
);
707 print_columns(&output
, colopts
, NULL
);
708 string_list_clear(&output
, 0);
711 else if (edit_description
) {
712 const char *branch_name
;
713 struct strbuf branch_ref
= STRBUF_INIT
;
717 die(_("Cannot give description to detached HEAD"));
719 } else if (argc
== 1)
720 branch_name
= argv
[0];
722 die(_("cannot edit description of more than one branch"));
724 strbuf_addf(&branch_ref
, "refs/heads/%s", branch_name
);
725 if (!ref_exists(branch_ref
.buf
)) {
726 strbuf_release(&branch_ref
);
729 return error(_("No commit on branch '%s' yet."),
732 return error(_("No branch named '%s'."),
735 strbuf_release(&branch_ref
);
737 if (edit_branch_description(branch_name
))
741 die(_("branch name required"));
743 copy_or_rename_branch(head
, argv
[0], 1, copy
> 1);
745 copy_or_rename_branch(argv
[0], argv
[1], 1, copy
> 1);
747 die(_("too many branches for a copy operation"));
750 die(_("branch name required"));
752 copy_or_rename_branch(head
, argv
[0], 0, rename
> 1);
754 copy_or_rename_branch(argv
[0], argv
[1], 0, rename
> 1);
756 die(_("too many arguments for a rename operation"));
757 } else if (new_upstream
) {
758 struct branch
*branch
= branch_get(argv
[0]);
761 die(_("too many arguments to set new upstream"));
764 if (!argc
|| !strcmp(argv
[0], "HEAD"))
765 die(_("could not set upstream of HEAD to %s when "
766 "it does not point to any branch."),
768 die(_("no such branch '%s'"), argv
[0]);
771 if (!ref_exists(branch
->refname
))
772 die(_("branch '%s' does not exist"), branch
->name
);
775 * create_branch takes care of setting up the tracking
776 * info and making sure new_upstream is correct
778 create_branch(branch
->name
, new_upstream
, 0, 0, 0, quiet
, BRANCH_TRACK_OVERRIDE
);
779 } else if (unset_upstream
) {
780 struct branch
*branch
= branch_get(argv
[0]);
781 struct strbuf buf
= STRBUF_INIT
;
784 die(_("too many arguments to unset upstream"));
787 if (!argc
|| !strcmp(argv
[0], "HEAD"))
788 die(_("could not unset upstream of HEAD when "
789 "it does not point to any branch."));
790 die(_("no such branch '%s'"), argv
[0]);
793 if (!branch_has_merge_config(branch
))
794 die(_("Branch '%s' has no upstream information"), branch
->name
);
796 strbuf_addf(&buf
, "branch.%s.remote", branch
->name
);
797 git_config_set_multivar(buf
.buf
, NULL
, NULL
, 1);
799 strbuf_addf(&buf
, "branch.%s.merge", branch
->name
);
800 git_config_set_multivar(buf
.buf
, NULL
, NULL
, 1);
801 strbuf_release(&buf
);
802 } else if (argc
> 0 && argc
<= 2) {
803 struct branch
*branch
= branch_get(argv
[0]);
806 die(_("no such branch '%s'"), argv
[0]);
808 if (filter
.kind
!= FILTER_REFS_BRANCHES
)
809 die(_("-a and -r options to 'git branch' do not make sense with a branch name"));
811 if (track
== BRANCH_TRACK_OVERRIDE
)
812 die(_("the '--set-upstream' option is no longer supported. Please use '--track' or '--set-upstream-to' instead."));
814 create_branch(argv
[0], (argc
== 2) ? argv
[1] : head
,
815 force
, 0, reflog
, quiet
, track
);
818 usage_with_options(builtin_branch_usage
, options
);