4 * Copyright (c) 2006 Kristian Høgsberg <krh@redhat.com>
5 * Based on git-branch.sh by Junio C Hamano.
14 #include "parse-options.h"
19 static const char * const builtin_branch_usage
[] = {
20 "git branch [options] [-r | -a] [--merged | --no-merged]",
21 "git branch [options] [-l] [-f] <branchname> [<start-point>]",
22 "git branch [options] [-r] (-d | -D) <branchname>...",
23 "git branch [options] (-m | -M) [<oldbranch>] <newbranch>",
27 #define REF_LOCAL_BRANCH 0x01
28 #define REF_REMOTE_BRANCH 0x02
30 static const char *head
;
31 static unsigned char head_sha1
[20];
33 static int branch_use_color
= -1;
34 static char branch_colors
[][COLOR_MAXLEN
] = {
36 GIT_COLOR_NORMAL
, /* PLAIN */
37 GIT_COLOR_RED
, /* REMOTE */
38 GIT_COLOR_NORMAL
, /* LOCAL */
39 GIT_COLOR_GREEN
, /* CURRENT */
42 BRANCH_COLOR_RESET
= 0,
43 BRANCH_COLOR_PLAIN
= 1,
44 BRANCH_COLOR_REMOTE
= 2,
45 BRANCH_COLOR_LOCAL
= 3,
46 BRANCH_COLOR_CURRENT
= 4
49 static enum merge_filter
{
54 static unsigned char merge_filter_ref
[20];
56 static int parse_branch_color_slot(const char *var
, int ofs
)
58 if (!strcasecmp(var
+ofs
, "plain"))
59 return BRANCH_COLOR_PLAIN
;
60 if (!strcasecmp(var
+ofs
, "reset"))
61 return BRANCH_COLOR_RESET
;
62 if (!strcasecmp(var
+ofs
, "remote"))
63 return BRANCH_COLOR_REMOTE
;
64 if (!strcasecmp(var
+ofs
, "local"))
65 return BRANCH_COLOR_LOCAL
;
66 if (!strcasecmp(var
+ofs
, "current"))
67 return BRANCH_COLOR_CURRENT
;
71 static int git_branch_config(const char *var
, const char *value
, void *cb
)
73 if (!strcmp(var
, "color.branch")) {
74 branch_use_color
= git_config_colorbool(var
, value
);
77 if (!prefixcmp(var
, "color.branch.")) {
78 int slot
= parse_branch_color_slot(var
, 13);
82 return config_error_nonbool(var
);
83 color_parse(value
, var
, branch_colors
[slot
]);
86 return git_color_default_config(var
, value
, cb
);
89 static const char *branch_get_color(enum color_branch ix
)
91 if (want_color(branch_use_color
))
92 return branch_colors
[ix
];
96 static int branch_merged(int kind
, const char *name
,
97 struct commit
*rev
, struct commit
*head_rev
)
100 * This checks whether the merge bases of branch and HEAD (or
101 * the other branch this branch builds upon) contains the
102 * branch, which means that the branch has already been merged
103 * safely to HEAD (or the other branch).
105 struct commit
*reference_rev
= NULL
;
106 const char *reference_name
= NULL
;
109 if (kind
== REF_LOCAL_BRANCH
) {
110 struct branch
*branch
= branch_get(name
);
111 unsigned char sha1
[20];
116 branch
->merge
[0]->dst
&&
118 resolve_ref(branch
->merge
[0]->dst
, sha1
, 1, NULL
)) != NULL
) {
119 reference_name
= xstrdup(reference_name
);
120 reference_rev
= lookup_commit_reference(sha1
);
124 reference_rev
= head_rev
;
126 merged
= in_merge_bases(rev
, &reference_rev
, 1);
129 * After the safety valve is fully redefined to "check with
130 * upstream, if any, otherwise with HEAD", we should just
131 * return the result of the in_merge_bases() above without
132 * any of the following code, but during the transition period,
133 * a gentle reminder is in order.
135 if ((head_rev
!= reference_rev
) &&
136 in_merge_bases(rev
, &head_rev
, 1) != merged
) {
138 warning(_("deleting branch '%s' that has been merged to\n"
139 " '%s', but not yet merged to HEAD."),
140 name
, reference_name
);
142 warning(_("not deleting branch '%s' that is not yet merged to\n"
143 " '%s', even though it is merged to HEAD."),
144 name
, reference_name
);
146 free((char *)reference_name
);
150 static int delete_branches(int argc
, const char **argv
, int force
, int kinds
)
152 struct commit
*rev
, *head_rev
= NULL
;
153 unsigned char sha1
[20];
155 const char *fmt
, *remote
;
158 struct strbuf bname
= STRBUF_INIT
;
161 case REF_REMOTE_BRANCH
:
162 fmt
= "refs/remotes/%s";
163 /* TRANSLATORS: This is "remote " in "remote branch '%s' not found" */
164 remote
= _("remote ");
167 case REF_LOCAL_BRANCH
:
168 fmt
= "refs/heads/%s";
172 die(_("cannot use -a with -d"));
176 head_rev
= lookup_commit_reference(head_sha1
);
178 die(_("Couldn't look up commit object for HEAD"));
180 for (i
= 0; i
< argc
; i
++, strbuf_release(&bname
)) {
181 strbuf_branchname(&bname
, argv
[i
]);
182 if (kinds
== REF_LOCAL_BRANCH
&& !strcmp(head
, bname
.buf
)) {
183 error(_("Cannot delete the branch '%s' "
184 "which you are currently on."), bname
.buf
);
191 name
= xstrdup(mkpath(fmt
, bname
.buf
));
192 if (read_ref(name
, sha1
)) {
193 error(_("%sbranch '%s' not found."),
199 rev
= lookup_commit_reference(sha1
);
201 error(_("Couldn't look up commit object for '%s'"), name
);
206 if (!force
&& !branch_merged(kinds
, bname
.buf
, rev
, head_rev
)) {
207 error(_("The branch '%s' is not fully merged.\n"
208 "If you are sure you want to delete it, "
209 "run 'git branch -D %s'."), bname
.buf
, bname
.buf
);
214 if (delete_ref(name
, sha1
, 0)) {
215 error(_("Error deleting %sbranch '%s'"), remote
,
219 struct strbuf buf
= STRBUF_INIT
;
220 printf(_("Deleted %sbranch %s (was %s).\n"), remote
,
222 find_unique_abbrev(sha1
, DEFAULT_ABBREV
));
223 strbuf_addf(&buf
, "branch.%s", bname
.buf
);
224 if (git_config_rename_section(buf
.buf
, NULL
) < 0)
225 warning(_("Update of config-file failed"));
226 strbuf_release(&buf
);
238 unsigned int kind
, len
;
239 struct commit
*commit
;
243 struct rev_info revs
;
244 int index
, alloc
, maxwidth
, verbose
, abbrev
;
245 struct ref_item
*list
;
246 struct commit_list
*with_commit
;
250 static char *resolve_symref(const char *src
, const char *prefix
)
252 unsigned char sha1
[20];
254 const char *dst
, *cp
;
256 dst
= resolve_ref(src
, sha1
, 0, &flag
);
257 if (!(dst
&& (flag
& REF_ISSYMREF
)))
259 if (prefix
&& (cp
= skip_prefix(dst
, prefix
)))
264 struct append_ref_cb
{
265 struct ref_list
*ref_list
;
266 const char **pattern
;
270 static int match_patterns(const char **pattern
, const char *refname
)
273 return 1; /* no pattern always matches */
275 if (!fnmatch(*pattern
, refname
, 0))
282 static int append_ref(const char *refname
, const unsigned char *sha1
, int flags
, void *cb_data
)
284 struct append_ref_cb
*cb
= (struct append_ref_cb
*)(cb_data
);
285 struct ref_list
*ref_list
= cb
->ref_list
;
286 struct ref_item
*newitem
;
287 struct commit
*commit
;
289 const char *prefix
, *orig_refname
= refname
;
296 { REF_LOCAL_BRANCH
, "refs/heads/", 11 },
297 { REF_REMOTE_BRANCH
, "refs/remotes/", 13 },
301 for (i
= 0; i
< ARRAY_SIZE(ref_kind
); i
++) {
302 prefix
= ref_kind
[i
].prefix
;
303 if (strncmp(refname
, prefix
, ref_kind
[i
].pfxlen
))
305 kind
= ref_kind
[i
].kind
;
306 refname
+= ref_kind
[i
].pfxlen
;
309 if (ARRAY_SIZE(ref_kind
) <= i
)
312 /* Don't add types the caller doesn't want */
313 if ((kind
& ref_list
->kinds
) == 0)
316 if (!match_patterns(cb
->pattern
, refname
))
320 if (ref_list
->verbose
|| ref_list
->with_commit
|| merge_filter
!= NO_FILTER
) {
321 commit
= lookup_commit_reference_gently(sha1
, 1);
323 cb
->ret
= error(_("branch '%s' does not point at a commit"), refname
);
327 /* Filter with with_commit if specified */
328 if (!is_descendant_of(commit
, ref_list
->with_commit
))
331 if (merge_filter
!= NO_FILTER
)
332 add_pending_object(&ref_list
->revs
,
333 (struct object
*)commit
, refname
);
336 ALLOC_GROW(ref_list
->list
, ref_list
->index
+ 1, ref_list
->alloc
);
338 /* Record the new item */
339 newitem
= &(ref_list
->list
[ref_list
->index
++]);
340 newitem
->name
= xstrdup(refname
);
341 newitem
->kind
= kind
;
342 newitem
->commit
= commit
;
343 newitem
->len
= strlen(refname
);
344 newitem
->dest
= resolve_symref(orig_refname
, prefix
);
345 /* adjust for "remotes/" */
346 if (newitem
->kind
== REF_REMOTE_BRANCH
&&
347 ref_list
->kinds
!= REF_REMOTE_BRANCH
)
349 if (newitem
->len
> ref_list
->maxwidth
)
350 ref_list
->maxwidth
= newitem
->len
;
355 static void free_ref_list(struct ref_list
*ref_list
)
359 for (i
= 0; i
< ref_list
->index
; i
++) {
360 free(ref_list
->list
[i
].name
);
361 free(ref_list
->list
[i
].dest
);
363 free(ref_list
->list
);
366 static int ref_cmp(const void *r1
, const void *r2
)
368 struct ref_item
*c1
= (struct ref_item
*)(r1
);
369 struct ref_item
*c2
= (struct ref_item
*)(r2
);
371 if (c1
->kind
!= c2
->kind
)
372 return c1
->kind
- c2
->kind
;
373 return strcmp(c1
->name
, c2
->name
);
376 static void fill_tracking_info(struct strbuf
*stat
, const char *branch_name
,
377 int show_upstream_ref
)
380 struct branch
*branch
= branch_get(branch_name
);
382 if (!stat_tracking_info(branch
, &ours
, &theirs
)) {
383 if (branch
&& branch
->merge
&& branch
->merge
[0]->dst
&&
385 strbuf_addf(stat
, "[%s] ",
386 shorten_unambiguous_ref(branch
->merge
[0]->dst
, 0));
390 strbuf_addch(stat
, '[');
391 if (show_upstream_ref
)
392 strbuf_addf(stat
, "%s: ",
393 shorten_unambiguous_ref(branch
->merge
[0]->dst
, 0));
395 strbuf_addf(stat
, _("behind %d] "), theirs
);
397 strbuf_addf(stat
, _("ahead %d] "), ours
);
399 strbuf_addf(stat
, _("ahead %d, behind %d] "), ours
, theirs
);
402 static int matches_merge_filter(struct commit
*commit
)
406 if (merge_filter
== NO_FILTER
)
409 is_merged
= !!(commit
->object
.flags
& UNINTERESTING
);
410 return (is_merged
== (merge_filter
== SHOW_MERGED
));
413 static void add_verbose_info(struct strbuf
*out
, struct ref_item
*item
,
414 int verbose
, int abbrev
)
416 struct strbuf subject
= STRBUF_INIT
, stat
= STRBUF_INIT
;
417 const char *sub
= " **** invalid ref ****";
418 struct commit
*commit
= item
->commit
;
420 if (commit
&& !parse_commit(commit
)) {
421 pp_commit_easy(CMIT_FMT_ONELINE
, commit
, &subject
);
425 if (item
->kind
== REF_LOCAL_BRANCH
)
426 fill_tracking_info(&stat
, item
->name
, verbose
> 1);
428 strbuf_addf(out
, " %s %s%s",
429 find_unique_abbrev(item
->commit
->object
.sha1
, abbrev
),
431 strbuf_release(&stat
);
432 strbuf_release(&subject
);
435 static void print_ref_item(struct ref_item
*item
, int maxwidth
, int verbose
,
436 int abbrev
, int current
, char *prefix
)
440 struct commit
*commit
= item
->commit
;
441 struct strbuf out
= STRBUF_INIT
, name
= STRBUF_INIT
;
443 if (!matches_merge_filter(commit
))
446 switch (item
->kind
) {
447 case REF_LOCAL_BRANCH
:
448 color
= BRANCH_COLOR_LOCAL
;
450 case REF_REMOTE_BRANCH
:
451 color
= BRANCH_COLOR_REMOTE
;
454 color
= BRANCH_COLOR_PLAIN
;
461 color
= BRANCH_COLOR_CURRENT
;
464 strbuf_addf(&name
, "%s%s", prefix
, item
->name
);
466 strbuf_addf(&out
, "%c %s%-*s%s", c
, branch_get_color(color
),
468 branch_get_color(BRANCH_COLOR_RESET
));
470 strbuf_addf(&out
, "%c %s%s%s", c
, branch_get_color(color
),
471 name
.buf
, branch_get_color(BRANCH_COLOR_RESET
));
474 strbuf_addf(&out
, " -> %s", item
->dest
);
476 /* " f7c0c00 [ahead 58, behind 197] vcs-svn: drop obj_pool.h" */
477 add_verbose_info(&out
, item
, verbose
, abbrev
);
478 printf("%s\n", out
.buf
);
479 strbuf_release(&name
);
480 strbuf_release(&out
);
483 static int calc_maxwidth(struct ref_list
*refs
)
486 for (i
= 0; i
< refs
->index
; i
++) {
487 if (!matches_merge_filter(refs
->list
[i
].commit
))
489 if (refs
->list
[i
].len
> w
)
490 w
= refs
->list
[i
].len
;
496 static void show_detached(struct ref_list
*ref_list
)
498 struct commit
*head_commit
= lookup_commit_reference_gently(head_sha1
, 1);
500 if (head_commit
&& is_descendant_of(head_commit
, ref_list
->with_commit
)) {
501 struct ref_item item
;
502 item
.name
= xstrdup(_("(no branch)"));
503 item
.len
= strlen(item
.name
);
504 item
.kind
= REF_LOCAL_BRANCH
;
506 item
.commit
= head_commit
;
507 if (item
.len
> ref_list
->maxwidth
)
508 ref_list
->maxwidth
= item
.len
;
509 print_ref_item(&item
, ref_list
->maxwidth
, ref_list
->verbose
, ref_list
->abbrev
, 1, "");
514 static int print_ref_list(int kinds
, int detached
, int verbose
, int abbrev
, struct commit_list
*with_commit
, const char **pattern
)
517 struct append_ref_cb cb
;
518 struct ref_list ref_list
;
520 memset(&ref_list
, 0, sizeof(ref_list
));
521 ref_list
.kinds
= kinds
;
522 ref_list
.verbose
= verbose
;
523 ref_list
.abbrev
= abbrev
;
524 ref_list
.with_commit
= with_commit
;
525 if (merge_filter
!= NO_FILTER
)
526 init_revisions(&ref_list
.revs
, NULL
);
527 cb
.ref_list
= &ref_list
;
528 cb
.pattern
= pattern
;
530 for_each_rawref(append_ref
, &cb
);
531 if (merge_filter
!= NO_FILTER
) {
532 struct commit
*filter
;
533 filter
= lookup_commit_reference_gently(merge_filter_ref
, 0);
534 filter
->object
.flags
|= UNINTERESTING
;
535 add_pending_object(&ref_list
.revs
,
536 (struct object
*) filter
, "");
537 ref_list
.revs
.limited
= 1;
538 prepare_revision_walk(&ref_list
.revs
);
540 ref_list
.maxwidth
= calc_maxwidth(&ref_list
);
543 qsort(ref_list
.list
, ref_list
.index
, sizeof(struct ref_item
), ref_cmp
);
545 detached
= (detached
&& (kinds
& REF_LOCAL_BRANCH
));
546 if (detached
&& match_patterns(pattern
, "HEAD"))
547 show_detached(&ref_list
);
549 for (i
= 0; i
< ref_list
.index
; i
++) {
550 int current
= !detached
&&
551 (ref_list
.list
[i
].kind
== REF_LOCAL_BRANCH
) &&
552 !strcmp(ref_list
.list
[i
].name
, head
);
553 char *prefix
= (kinds
!= REF_REMOTE_BRANCH
&&
554 ref_list
.list
[i
].kind
== REF_REMOTE_BRANCH
)
556 print_ref_item(&ref_list
.list
[i
], ref_list
.maxwidth
, verbose
,
557 abbrev
, current
, prefix
);
560 free_ref_list(&ref_list
);
563 error(_("some refs could not be read"));
568 static void rename_branch(const char *oldname
, const char *newname
, int force
)
570 struct strbuf oldref
= STRBUF_INIT
, newref
= STRBUF_INIT
, logmsg
= STRBUF_INIT
;
571 struct strbuf oldsection
= STRBUF_INIT
, newsection
= STRBUF_INIT
;
576 die(_("cannot rename the current branch while not on any."));
578 if (strbuf_check_branch_ref(&oldref
, oldname
)) {
580 * Bad name --- this could be an attempt to rename a
581 * ref that we used to allow to be created by accident.
583 if (ref_exists(oldref
.buf
))
586 die(_("Invalid branch name: '%s'"), oldname
);
590 * A command like "git branch -M currentbranch currentbranch" cannot
591 * cause the worktree to become inconsistent with HEAD, so allow it.
593 clobber_head_ok
= !strcmp(oldname
, newname
);
595 validate_new_branchname(newname
, &newref
, force
, clobber_head_ok
);
597 strbuf_addf(&logmsg
, "Branch: renamed %s to %s",
598 oldref
.buf
, newref
.buf
);
600 if (rename_ref(oldref
.buf
, newref
.buf
, logmsg
.buf
))
601 die(_("Branch rename failed"));
602 strbuf_release(&logmsg
);
605 warning(_("Renamed a misnamed branch '%s' away"), oldref
.buf
+ 11);
607 /* no need to pass logmsg here as HEAD didn't really move */
608 if (!strcmp(oldname
, head
) && create_symref("HEAD", newref
.buf
, NULL
))
609 die(_("Branch renamed to %s, but HEAD is not updated!"), newname
);
611 strbuf_addf(&oldsection
, "branch.%s", oldref
.buf
+ 11);
612 strbuf_release(&oldref
);
613 strbuf_addf(&newsection
, "branch.%s", newref
.buf
+ 11);
614 strbuf_release(&newref
);
615 if (git_config_rename_section(oldsection
.buf
, newsection
.buf
) < 0)
616 die(_("Branch is renamed, but update of config-file failed"));
617 strbuf_release(&oldsection
);
618 strbuf_release(&newsection
);
621 static int opt_parse_merge_filter(const struct option
*opt
, const char *arg
, int unset
)
623 merge_filter
= ((opt
->long_name
[0] == 'n')
627 merge_filter
= SHOW_NOT_MERGED
; /* b/c for --no-merged */
630 if (get_sha1(arg
, merge_filter_ref
))
631 die(_("malformed object name %s"), arg
);
635 static const char edit_description
[] = "BRANCH_DESCRIPTION";
637 static int edit_branch_description(const char *branch_name
)
641 struct strbuf buf
= STRBUF_INIT
;
642 struct strbuf name
= STRBUF_INIT
;
644 read_branch_desc(&buf
, branch_name
);
645 if (!buf
.len
|| buf
.buf
[buf
.len
-1] != '\n')
646 strbuf_addch(&buf
, '\n');
648 "# Please edit the description for the branch\n"
650 "# Lines starting with '#' will be stripped.\n",
652 fp
= fopen(git_path(edit_description
), "w");
653 if ((fwrite(buf
.buf
, 1, buf
.len
, fp
) < buf
.len
) || fclose(fp
)) {
654 strbuf_release(&buf
);
655 return error(_("could not write branch description template: %s\n"),
659 if (launch_editor(git_path(edit_description
), &buf
, NULL
)) {
660 strbuf_release(&buf
);
665 strbuf_addf(&name
, "branch.%s.description", branch_name
);
666 status
= git_config_set(name
.buf
, buf
.buf
);
667 strbuf_release(&name
);
668 strbuf_release(&buf
);
673 int cmd_branch(int argc
, const char **argv
, const char *prefix
)
675 int delete = 0, rename
= 0, force_create
= 0, list
= 0;
676 int verbose
= 0, abbrev
= -1, detached
= 0;
677 int reflog
= 0, edit_description
= 0;
678 enum branch_track track
;
679 int kinds
= REF_LOCAL_BRANCH
;
680 struct commit_list
*with_commit
= NULL
;
682 struct option options
[] = {
683 OPT_GROUP("Generic options"),
684 OPT__VERBOSE(&verbose
,
685 "show hash and subject, give twice for upstream branch"),
686 OPT_SET_INT('t', "track", &track
, "set up tracking mode (see git-pull(1))",
687 BRANCH_TRACK_EXPLICIT
),
688 OPT_SET_INT( 0, "set-upstream", &track
, "change upstream info",
689 BRANCH_TRACK_OVERRIDE
),
690 OPT__COLOR(&branch_use_color
, "use colored output"),
691 OPT_SET_INT('r', "remotes", &kinds
, "act on remote-tracking branches",
694 OPTION_CALLBACK
, 0, "contains", &with_commit
, "commit",
695 "print only branches that contain the commit",
696 PARSE_OPT_LASTARG_DEFAULT
,
697 parse_opt_with_commit
, (intptr_t)"HEAD",
700 OPTION_CALLBACK
, 0, "with", &with_commit
, "commit",
701 "print only branches that contain the commit",
702 PARSE_OPT_HIDDEN
| PARSE_OPT_LASTARG_DEFAULT
,
703 parse_opt_with_commit
, (intptr_t) "HEAD",
705 OPT__ABBREV(&abbrev
),
707 OPT_GROUP("Specific git-branch actions:"),
708 OPT_SET_INT('a', "all", &kinds
, "list both remote-tracking and local branches",
709 REF_REMOTE_BRANCH
| REF_LOCAL_BRANCH
),
710 OPT_BIT('d', "delete", &delete, "delete fully merged branch", 1),
711 OPT_BIT('D', NULL
, &delete, "delete branch (even if not merged)", 2),
712 OPT_BIT('m', "move", &rename
, "move/rename a branch and its reflog", 1),
713 OPT_BIT('M', NULL
, &rename
, "move/rename a branch, even if target exists", 2),
714 OPT_BOOLEAN(0, "list", &list
, "list branch names"),
715 OPT_BOOLEAN('l', "create-reflog", &reflog
, "create the branch's reflog"),
716 OPT_BOOLEAN(0, "edit-description", &edit_description
,
717 "edit the description for the branch"),
718 OPT__FORCE(&force_create
, "force creation (when already exists)"),
720 OPTION_CALLBACK
, 0, "no-merged", &merge_filter_ref
,
721 "commit", "print only not merged branches",
722 PARSE_OPT_LASTARG_DEFAULT
| PARSE_OPT_NONEG
,
723 opt_parse_merge_filter
, (intptr_t) "HEAD",
726 OPTION_CALLBACK
, 0, "merged", &merge_filter_ref
,
727 "commit", "print only merged branches",
728 PARSE_OPT_LASTARG_DEFAULT
| PARSE_OPT_NONEG
,
729 opt_parse_merge_filter
, (intptr_t) "HEAD",
734 if (argc
== 2 && !strcmp(argv
[1], "-h"))
735 usage_with_options(builtin_branch_usage
, options
);
737 git_config(git_branch_config
, NULL
);
739 track
= git_branch_track
;
741 head
= resolve_ref("HEAD", head_sha1
, 0, NULL
);
743 die(_("Failed to resolve HEAD as a valid ref."));
744 head
= xstrdup(head
);
745 if (!strcmp(head
, "HEAD")) {
748 if (prefixcmp(head
, "refs/heads/"))
749 die(_("HEAD not found below refs/heads!"));
752 hashcpy(merge_filter_ref
, head_sha1
);
754 argc
= parse_options(argc
, argv
, prefix
, options
, builtin_branch_usage
,
757 if (!delete && !rename
&& !edit_description
&& argc
== 0)
760 if (!!delete + !!rename
+ !!force_create
+ !!list
> 1)
761 usage_with_options(builtin_branch_usage
, options
);
764 abbrev
= DEFAULT_ABBREV
;
767 return delete_branches(argc
, argv
, delete > 1, kinds
);
769 return print_ref_list(kinds
, detached
, verbose
, abbrev
,
771 else if (edit_description
) {
772 const char *branch_name
;
774 die("Cannot give description to detached HEAD");
778 branch_name
= argv
[0];
780 usage_with_options(builtin_branch_usage
, options
);
781 if (edit_branch_description(branch_name
))
785 rename_branch(head
, argv
[0], rename
> 1);
787 rename_branch(argv
[0], argv
[1], rename
> 1);
789 usage_with_options(builtin_branch_usage
, options
);
790 } else if (argc
> 0 && argc
<= 2) {
791 if (kinds
!= REF_LOCAL_BRANCH
)
792 die(_("-a and -r options to 'git branch' do not make sense with a branch name"));
793 create_branch(head
, argv
[0], (argc
== 2) ? argv
[1] : head
,
794 force_create
, reflog
, 0, track
);
796 usage_with_options(builtin_branch_usage
, options
);