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"
18 #include "string-list.h"
21 static const char * const builtin_branch_usage
[] = {
22 "git branch [options] [-r | -a] [--merged | --no-merged]",
23 "git branch [options] [-l] [-f] <branchname> [<start-point>]",
24 "git branch [options] [-r] (-d | -D) <branchname>...",
25 "git branch [options] (-m | -M) [<oldbranch>] <newbranch>",
29 #define REF_LOCAL_BRANCH 0x01
30 #define REF_REMOTE_BRANCH 0x02
32 static const char *head
;
33 static unsigned char head_sha1
[20];
35 static int branch_use_color
= -1;
36 static char branch_colors
[][COLOR_MAXLEN
] = {
38 GIT_COLOR_NORMAL
, /* PLAIN */
39 GIT_COLOR_RED
, /* REMOTE */
40 GIT_COLOR_NORMAL
, /* LOCAL */
41 GIT_COLOR_GREEN
, /* CURRENT */
44 BRANCH_COLOR_RESET
= 0,
45 BRANCH_COLOR_PLAIN
= 1,
46 BRANCH_COLOR_REMOTE
= 2,
47 BRANCH_COLOR_LOCAL
= 3,
48 BRANCH_COLOR_CURRENT
= 4
51 static enum merge_filter
{
56 static unsigned char merge_filter_ref
[20];
58 static struct string_list output
= STRING_LIST_INIT_DUP
;
59 static unsigned int colopts
;
61 static int parse_branch_color_slot(const char *var
, int ofs
)
63 if (!strcasecmp(var
+ofs
, "plain"))
64 return BRANCH_COLOR_PLAIN
;
65 if (!strcasecmp(var
+ofs
, "reset"))
66 return BRANCH_COLOR_RESET
;
67 if (!strcasecmp(var
+ofs
, "remote"))
68 return BRANCH_COLOR_REMOTE
;
69 if (!strcasecmp(var
+ofs
, "local"))
70 return BRANCH_COLOR_LOCAL
;
71 if (!strcasecmp(var
+ofs
, "current"))
72 return BRANCH_COLOR_CURRENT
;
76 static int git_branch_config(const char *var
, const char *value
, void *cb
)
78 if (!prefixcmp(var
, "column."))
79 return git_column_config(var
, value
, "branch", &colopts
);
80 if (!strcmp(var
, "color.branch")) {
81 branch_use_color
= git_config_colorbool(var
, value
);
84 if (!prefixcmp(var
, "color.branch.")) {
85 int slot
= parse_branch_color_slot(var
, 13);
89 return config_error_nonbool(var
);
90 color_parse(value
, var
, branch_colors
[slot
]);
93 return git_color_default_config(var
, value
, cb
);
96 static const char *branch_get_color(enum color_branch ix
)
98 if (want_color(branch_use_color
))
99 return branch_colors
[ix
];
103 static int branch_merged(int kind
, const char *name
,
104 struct commit
*rev
, struct commit
*head_rev
)
107 * This checks whether the merge bases of branch and HEAD (or
108 * the other branch this branch builds upon) contains the
109 * branch, which means that the branch has already been merged
110 * safely to HEAD (or the other branch).
112 struct commit
*reference_rev
= NULL
;
113 const char *reference_name
= NULL
;
114 void *reference_name_to_free
= NULL
;
117 if (kind
== REF_LOCAL_BRANCH
) {
118 struct branch
*branch
= branch_get(name
);
119 unsigned char sha1
[20];
124 branch
->merge
[0]->dst
&&
125 (reference_name
= reference_name_to_free
=
126 resolve_refdup(branch
->merge
[0]->dst
, sha1
, 1, NULL
)) != NULL
)
127 reference_rev
= lookup_commit_reference(sha1
);
130 reference_rev
= head_rev
;
132 merged
= in_merge_bases(rev
, &reference_rev
, 1);
135 * After the safety valve is fully redefined to "check with
136 * upstream, if any, otherwise with HEAD", we should just
137 * return the result of the in_merge_bases() above without
138 * any of the following code, but during the transition period,
139 * a gentle reminder is in order.
141 if ((head_rev
!= reference_rev
) &&
142 in_merge_bases(rev
, &head_rev
, 1) != merged
) {
144 warning(_("deleting branch '%s' that has been merged to\n"
145 " '%s', but not yet merged to HEAD."),
146 name
, reference_name
);
148 warning(_("not deleting branch '%s' that is not yet merged to\n"
149 " '%s', even though it is merged to HEAD."),
150 name
, reference_name
);
152 free(reference_name_to_free
);
156 static int delete_branches(int argc
, const char **argv
, int force
, int kinds
)
158 struct commit
*rev
, *head_rev
= NULL
;
159 unsigned char sha1
[20];
161 const char *fmt
, *remote
;
164 struct strbuf bname
= STRBUF_INIT
;
167 case REF_REMOTE_BRANCH
:
168 fmt
= "refs/remotes/%s";
169 /* TRANSLATORS: This is "remote " in "remote branch '%s' not found" */
170 remote
= _("remote ");
173 case REF_LOCAL_BRANCH
:
174 fmt
= "refs/heads/%s";
178 die(_("cannot use -a with -d"));
182 head_rev
= lookup_commit_reference(head_sha1
);
184 die(_("Couldn't look up commit object for HEAD"));
186 for (i
= 0; i
< argc
; i
++, strbuf_release(&bname
)) {
187 strbuf_branchname(&bname
, argv
[i
]);
188 if (kinds
== REF_LOCAL_BRANCH
&& !strcmp(head
, bname
.buf
)) {
189 error(_("Cannot delete the branch '%s' "
190 "which you are currently on."), bname
.buf
);
197 name
= xstrdup(mkpath(fmt
, bname
.buf
));
198 if (read_ref(name
, sha1
)) {
199 error(_("%sbranch '%s' not found."),
205 rev
= lookup_commit_reference(sha1
);
207 error(_("Couldn't look up commit object for '%s'"), name
);
212 if (!force
&& !branch_merged(kinds
, bname
.buf
, rev
, head_rev
)) {
213 error(_("The branch '%s' is not fully merged.\n"
214 "If you are sure you want to delete it, "
215 "run 'git branch -D %s'."), bname
.buf
, bname
.buf
);
220 if (delete_ref(name
, sha1
, 0)) {
221 error(_("Error deleting %sbranch '%s'"), remote
,
225 struct strbuf buf
= STRBUF_INIT
;
226 printf(_("Deleted %sbranch %s (was %s).\n"), remote
,
228 find_unique_abbrev(sha1
, DEFAULT_ABBREV
));
229 strbuf_addf(&buf
, "branch.%s", bname
.buf
);
230 if (git_config_rename_section(buf
.buf
, NULL
) < 0)
231 warning(_("Update of config-file failed"));
232 strbuf_release(&buf
);
244 unsigned int kind
, len
;
245 struct commit
*commit
;
249 struct rev_info revs
;
250 int index
, alloc
, maxwidth
, verbose
, abbrev
;
251 struct ref_item
*list
;
252 struct commit_list
*with_commit
;
256 static char *resolve_symref(const char *src
, const char *prefix
)
258 unsigned char sha1
[20];
260 const char *dst
, *cp
;
262 dst
= resolve_ref_unsafe(src
, sha1
, 0, &flag
);
263 if (!(dst
&& (flag
& REF_ISSYMREF
)))
265 if (prefix
&& (cp
= skip_prefix(dst
, prefix
)))
270 struct append_ref_cb
{
271 struct ref_list
*ref_list
;
272 const char **pattern
;
276 static int match_patterns(const char **pattern
, const char *refname
)
279 return 1; /* no pattern always matches */
281 if (!fnmatch(*pattern
, refname
, 0))
288 static int append_ref(const char *refname
, const unsigned char *sha1
, int flags
, void *cb_data
)
290 struct append_ref_cb
*cb
= (struct append_ref_cb
*)(cb_data
);
291 struct ref_list
*ref_list
= cb
->ref_list
;
292 struct ref_item
*newitem
;
293 struct commit
*commit
;
295 const char *prefix
, *orig_refname
= refname
;
302 { REF_LOCAL_BRANCH
, "refs/heads/", 11 },
303 { REF_REMOTE_BRANCH
, "refs/remotes/", 13 },
307 for (i
= 0; i
< ARRAY_SIZE(ref_kind
); i
++) {
308 prefix
= ref_kind
[i
].prefix
;
309 if (strncmp(refname
, prefix
, ref_kind
[i
].pfxlen
))
311 kind
= ref_kind
[i
].kind
;
312 refname
+= ref_kind
[i
].pfxlen
;
315 if (ARRAY_SIZE(ref_kind
) <= i
)
318 /* Don't add types the caller doesn't want */
319 if ((kind
& ref_list
->kinds
) == 0)
322 if (!match_patterns(cb
->pattern
, refname
))
326 if (ref_list
->verbose
|| ref_list
->with_commit
|| merge_filter
!= NO_FILTER
) {
327 commit
= lookup_commit_reference_gently(sha1
, 1);
329 cb
->ret
= error(_("branch '%s' does not point at a commit"), refname
);
333 /* Filter with with_commit if specified */
334 if (!is_descendant_of(commit
, ref_list
->with_commit
))
337 if (merge_filter
!= NO_FILTER
)
338 add_pending_object(&ref_list
->revs
,
339 (struct object
*)commit
, refname
);
342 ALLOC_GROW(ref_list
->list
, ref_list
->index
+ 1, ref_list
->alloc
);
344 /* Record the new item */
345 newitem
= &(ref_list
->list
[ref_list
->index
++]);
346 newitem
->name
= xstrdup(refname
);
347 newitem
->kind
= kind
;
348 newitem
->commit
= commit
;
349 newitem
->len
= strlen(refname
);
350 newitem
->dest
= resolve_symref(orig_refname
, prefix
);
351 /* adjust for "remotes/" */
352 if (newitem
->kind
== REF_REMOTE_BRANCH
&&
353 ref_list
->kinds
!= REF_REMOTE_BRANCH
)
355 if (newitem
->len
> ref_list
->maxwidth
)
356 ref_list
->maxwidth
= newitem
->len
;
361 static void free_ref_list(struct ref_list
*ref_list
)
365 for (i
= 0; i
< ref_list
->index
; i
++) {
366 free(ref_list
->list
[i
].name
);
367 free(ref_list
->list
[i
].dest
);
369 free(ref_list
->list
);
372 static int ref_cmp(const void *r1
, const void *r2
)
374 struct ref_item
*c1
= (struct ref_item
*)(r1
);
375 struct ref_item
*c2
= (struct ref_item
*)(r2
);
377 if (c1
->kind
!= c2
->kind
)
378 return c1
->kind
- c2
->kind
;
379 return strcmp(c1
->name
, c2
->name
);
382 static void fill_tracking_info(struct strbuf
*stat
, const char *branch_name
,
383 int show_upstream_ref
)
386 struct branch
*branch
= branch_get(branch_name
);
388 if (!stat_tracking_info(branch
, &ours
, &theirs
)) {
389 if (branch
&& branch
->merge
&& branch
->merge
[0]->dst
&&
391 strbuf_addf(stat
, "[%s] ",
392 shorten_unambiguous_ref(branch
->merge
[0]->dst
, 0));
396 strbuf_addch(stat
, '[');
397 if (show_upstream_ref
)
398 strbuf_addf(stat
, "%s: ",
399 shorten_unambiguous_ref(branch
->merge
[0]->dst
, 0));
401 strbuf_addf(stat
, _("behind %d] "), theirs
);
403 strbuf_addf(stat
, _("ahead %d] "), ours
);
405 strbuf_addf(stat
, _("ahead %d, behind %d] "), ours
, theirs
);
408 static int matches_merge_filter(struct commit
*commit
)
412 if (merge_filter
== NO_FILTER
)
415 is_merged
= !!(commit
->object
.flags
& UNINTERESTING
);
416 return (is_merged
== (merge_filter
== SHOW_MERGED
));
419 static void add_verbose_info(struct strbuf
*out
, struct ref_item
*item
,
420 int verbose
, int abbrev
)
422 struct strbuf subject
= STRBUF_INIT
, stat
= STRBUF_INIT
;
423 const char *sub
= " **** invalid ref ****";
424 struct commit
*commit
= item
->commit
;
426 if (commit
&& !parse_commit(commit
)) {
427 pp_commit_easy(CMIT_FMT_ONELINE
, commit
, &subject
);
431 if (item
->kind
== REF_LOCAL_BRANCH
)
432 fill_tracking_info(&stat
, item
->name
, verbose
> 1);
434 strbuf_addf(out
, " %s %s%s",
435 find_unique_abbrev(item
->commit
->object
.sha1
, abbrev
),
437 strbuf_release(&stat
);
438 strbuf_release(&subject
);
441 static void print_ref_item(struct ref_item
*item
, int maxwidth
, int verbose
,
442 int abbrev
, int current
, char *prefix
)
446 struct commit
*commit
= item
->commit
;
447 struct strbuf out
= STRBUF_INIT
, name
= STRBUF_INIT
;
449 if (!matches_merge_filter(commit
))
452 switch (item
->kind
) {
453 case REF_LOCAL_BRANCH
:
454 color
= BRANCH_COLOR_LOCAL
;
456 case REF_REMOTE_BRANCH
:
457 color
= BRANCH_COLOR_REMOTE
;
460 color
= BRANCH_COLOR_PLAIN
;
467 color
= BRANCH_COLOR_CURRENT
;
470 strbuf_addf(&name
, "%s%s", prefix
, item
->name
);
472 strbuf_addf(&out
, "%c %s%-*s%s", c
, branch_get_color(color
),
474 branch_get_color(BRANCH_COLOR_RESET
));
476 strbuf_addf(&out
, "%c %s%s%s", c
, branch_get_color(color
),
477 name
.buf
, branch_get_color(BRANCH_COLOR_RESET
));
480 strbuf_addf(&out
, " -> %s", item
->dest
);
482 /* " f7c0c00 [ahead 58, behind 197] vcs-svn: drop obj_pool.h" */
483 add_verbose_info(&out
, item
, verbose
, abbrev
);
484 if (column_active(colopts
)) {
485 assert(!verbose
&& "--column and --verbose are incompatible");
486 string_list_append(&output
, out
.buf
);
488 printf("%s\n", out
.buf
);
490 strbuf_release(&name
);
491 strbuf_release(&out
);
494 static int calc_maxwidth(struct ref_list
*refs
)
497 for (i
= 0; i
< refs
->index
; i
++) {
498 if (!matches_merge_filter(refs
->list
[i
].commit
))
500 if (refs
->list
[i
].len
> w
)
501 w
= refs
->list
[i
].len
;
507 static void show_detached(struct ref_list
*ref_list
)
509 struct commit
*head_commit
= lookup_commit_reference_gently(head_sha1
, 1);
511 if (head_commit
&& is_descendant_of(head_commit
, ref_list
->with_commit
)) {
512 struct ref_item item
;
513 item
.name
= xstrdup(_("(no branch)"));
514 item
.len
= strlen(item
.name
);
515 item
.kind
= REF_LOCAL_BRANCH
;
517 item
.commit
= head_commit
;
518 if (item
.len
> ref_list
->maxwidth
)
519 ref_list
->maxwidth
= item
.len
;
520 print_ref_item(&item
, ref_list
->maxwidth
, ref_list
->verbose
, ref_list
->abbrev
, 1, "");
525 static int print_ref_list(int kinds
, int detached
, int verbose
, int abbrev
, struct commit_list
*with_commit
, const char **pattern
)
528 struct append_ref_cb cb
;
529 struct ref_list ref_list
;
531 memset(&ref_list
, 0, sizeof(ref_list
));
532 ref_list
.kinds
= kinds
;
533 ref_list
.verbose
= verbose
;
534 ref_list
.abbrev
= abbrev
;
535 ref_list
.with_commit
= with_commit
;
536 if (merge_filter
!= NO_FILTER
)
537 init_revisions(&ref_list
.revs
, NULL
);
538 cb
.ref_list
= &ref_list
;
539 cb
.pattern
= pattern
;
541 for_each_rawref(append_ref
, &cb
);
542 if (merge_filter
!= NO_FILTER
) {
543 struct commit
*filter
;
544 filter
= lookup_commit_reference_gently(merge_filter_ref
, 0);
545 filter
->object
.flags
|= UNINTERESTING
;
546 add_pending_object(&ref_list
.revs
,
547 (struct object
*) filter
, "");
548 ref_list
.revs
.limited
= 1;
549 prepare_revision_walk(&ref_list
.revs
);
551 ref_list
.maxwidth
= calc_maxwidth(&ref_list
);
554 qsort(ref_list
.list
, ref_list
.index
, sizeof(struct ref_item
), ref_cmp
);
556 detached
= (detached
&& (kinds
& REF_LOCAL_BRANCH
));
557 if (detached
&& match_patterns(pattern
, "HEAD"))
558 show_detached(&ref_list
);
560 for (i
= 0; i
< ref_list
.index
; i
++) {
561 int current
= !detached
&&
562 (ref_list
.list
[i
].kind
== REF_LOCAL_BRANCH
) &&
563 !strcmp(ref_list
.list
[i
].name
, head
);
564 char *prefix
= (kinds
!= REF_REMOTE_BRANCH
&&
565 ref_list
.list
[i
].kind
== REF_REMOTE_BRANCH
)
567 print_ref_item(&ref_list
.list
[i
], ref_list
.maxwidth
, verbose
,
568 abbrev
, current
, prefix
);
571 free_ref_list(&ref_list
);
574 error(_("some refs could not be read"));
579 static void rename_branch(const char *oldname
, const char *newname
, int force
)
581 struct strbuf oldref
= STRBUF_INIT
, newref
= STRBUF_INIT
, logmsg
= STRBUF_INIT
;
582 struct strbuf oldsection
= STRBUF_INIT
, newsection
= STRBUF_INIT
;
587 die(_("cannot rename the current branch while not on any."));
589 if (strbuf_check_branch_ref(&oldref
, oldname
)) {
591 * Bad name --- this could be an attempt to rename a
592 * ref that we used to allow to be created by accident.
594 if (ref_exists(oldref
.buf
))
597 die(_("Invalid branch name: '%s'"), oldname
);
601 * A command like "git branch -M currentbranch currentbranch" cannot
602 * cause the worktree to become inconsistent with HEAD, so allow it.
604 clobber_head_ok
= !strcmp(oldname
, newname
);
606 validate_new_branchname(newname
, &newref
, force
, clobber_head_ok
);
608 strbuf_addf(&logmsg
, "Branch: renamed %s to %s",
609 oldref
.buf
, newref
.buf
);
611 if (rename_ref(oldref
.buf
, newref
.buf
, logmsg
.buf
))
612 die(_("Branch rename failed"));
613 strbuf_release(&logmsg
);
616 warning(_("Renamed a misnamed branch '%s' away"), oldref
.buf
+ 11);
618 /* no need to pass logmsg here as HEAD didn't really move */
619 if (!strcmp(oldname
, head
) && create_symref("HEAD", newref
.buf
, NULL
))
620 die(_("Branch renamed to %s, but HEAD is not updated!"), newname
);
622 strbuf_addf(&oldsection
, "branch.%s", oldref
.buf
+ 11);
623 strbuf_release(&oldref
);
624 strbuf_addf(&newsection
, "branch.%s", newref
.buf
+ 11);
625 strbuf_release(&newref
);
626 if (git_config_rename_section(oldsection
.buf
, newsection
.buf
) < 0)
627 die(_("Branch is renamed, but update of config-file failed"));
628 strbuf_release(&oldsection
);
629 strbuf_release(&newsection
);
632 static int opt_parse_merge_filter(const struct option
*opt
, const char *arg
, int unset
)
634 merge_filter
= ((opt
->long_name
[0] == 'n')
638 merge_filter
= SHOW_NOT_MERGED
; /* b/c for --no-merged */
641 if (get_sha1(arg
, merge_filter_ref
))
642 die(_("malformed object name %s"), arg
);
646 static const char edit_description
[] = "BRANCH_DESCRIPTION";
648 static int edit_branch_description(const char *branch_name
)
652 struct strbuf buf
= STRBUF_INIT
;
653 struct strbuf name
= STRBUF_INIT
;
655 read_branch_desc(&buf
, branch_name
);
656 if (!buf
.len
|| buf
.buf
[buf
.len
-1] != '\n')
657 strbuf_addch(&buf
, '\n');
659 "# Please edit the description for the branch\n"
661 "# Lines starting with '#' will be stripped.\n",
663 fp
= fopen(git_path(edit_description
), "w");
664 if ((fwrite(buf
.buf
, 1, buf
.len
, fp
) < buf
.len
) || fclose(fp
)) {
665 strbuf_release(&buf
);
666 return error(_("could not write branch description template: %s\n"),
670 if (launch_editor(git_path(edit_description
), &buf
, NULL
)) {
671 strbuf_release(&buf
);
676 strbuf_addf(&name
, "branch.%s.description", branch_name
);
677 status
= git_config_set(name
.buf
, buf
.buf
);
678 strbuf_release(&name
);
679 strbuf_release(&buf
);
684 int cmd_branch(int argc
, const char **argv
, const char *prefix
)
686 int delete = 0, rename
= 0, force_create
= 0, list
= 0;
687 int verbose
= 0, abbrev
= -1, detached
= 0;
688 int reflog
= 0, edit_description
= 0;
689 enum branch_track track
;
690 int kinds
= REF_LOCAL_BRANCH
;
691 struct commit_list
*with_commit
= NULL
;
693 struct option options
[] = {
694 OPT_GROUP("Generic options"),
695 OPT__VERBOSE(&verbose
,
696 "show hash and subject, give twice for upstream branch"),
697 OPT_SET_INT('t', "track", &track
, "set up tracking mode (see git-pull(1))",
698 BRANCH_TRACK_EXPLICIT
),
699 OPT_SET_INT( 0, "set-upstream", &track
, "change upstream info",
700 BRANCH_TRACK_OVERRIDE
),
701 OPT__COLOR(&branch_use_color
, "use colored output"),
702 OPT_SET_INT('r', "remotes", &kinds
, "act on remote-tracking branches",
705 OPTION_CALLBACK
, 0, "contains", &with_commit
, "commit",
706 "print only branches that contain the commit",
707 PARSE_OPT_LASTARG_DEFAULT
,
708 parse_opt_with_commit
, (intptr_t)"HEAD",
711 OPTION_CALLBACK
, 0, "with", &with_commit
, "commit",
712 "print only branches that contain the commit",
713 PARSE_OPT_HIDDEN
| PARSE_OPT_LASTARG_DEFAULT
,
714 parse_opt_with_commit
, (intptr_t) "HEAD",
716 OPT__ABBREV(&abbrev
),
718 OPT_GROUP("Specific git-branch actions:"),
719 OPT_SET_INT('a', "all", &kinds
, "list both remote-tracking and local branches",
720 REF_REMOTE_BRANCH
| REF_LOCAL_BRANCH
),
721 OPT_BIT('d', "delete", &delete, "delete fully merged branch", 1),
722 OPT_BIT('D', NULL
, &delete, "delete branch (even if not merged)", 2),
723 OPT_BIT('m', "move", &rename
, "move/rename a branch and its reflog", 1),
724 OPT_BIT('M', NULL
, &rename
, "move/rename a branch, even if target exists", 2),
725 OPT_BOOLEAN(0, "list", &list
, "list branch names"),
726 OPT_BOOLEAN('l', "create-reflog", &reflog
, "create the branch's reflog"),
727 OPT_BOOLEAN(0, "edit-description", &edit_description
,
728 "edit the description for the branch"),
729 OPT__FORCE(&force_create
, "force creation (when already exists)"),
731 OPTION_CALLBACK
, 0, "no-merged", &merge_filter_ref
,
732 "commit", "print only not merged branches",
733 PARSE_OPT_LASTARG_DEFAULT
| PARSE_OPT_NONEG
,
734 opt_parse_merge_filter
, (intptr_t) "HEAD",
737 OPTION_CALLBACK
, 0, "merged", &merge_filter_ref
,
738 "commit", "print only merged branches",
739 PARSE_OPT_LASTARG_DEFAULT
| PARSE_OPT_NONEG
,
740 opt_parse_merge_filter
, (intptr_t) "HEAD",
742 OPT_COLUMN(0, "column", &colopts
, "list branches in columns"),
746 if (argc
== 2 && !strcmp(argv
[1], "-h"))
747 usage_with_options(builtin_branch_usage
, options
);
749 git_config(git_branch_config
, NULL
);
751 track
= git_branch_track
;
753 head
= resolve_refdup("HEAD", head_sha1
, 0, NULL
);
755 die(_("Failed to resolve HEAD as a valid ref."));
756 if (!strcmp(head
, "HEAD")) {
759 if (prefixcmp(head
, "refs/heads/"))
760 die(_("HEAD not found below refs/heads!"));
763 hashcpy(merge_filter_ref
, head_sha1
);
766 argc
= parse_options(argc
, argv
, prefix
, options
, builtin_branch_usage
,
769 if (!delete && !rename
&& !edit_description
&& argc
== 0)
772 if (!!delete + !!rename
+ !!force_create
+ !!list
> 1)
773 usage_with_options(builtin_branch_usage
, options
);
776 abbrev
= DEFAULT_ABBREV
;
777 finalize_colopts(&colopts
, -1);
779 if (explicitly_enable_column(colopts
))
780 die(_("--column and --verbose are incompatible"));
785 return delete_branches(argc
, argv
, delete > 1, kinds
);
787 int ret
= print_ref_list(kinds
, detached
, verbose
, abbrev
,
789 print_columns(&output
, colopts
, NULL
);
790 string_list_clear(&output
, 0);
793 else if (edit_description
) {
794 const char *branch_name
;
795 struct strbuf branch_ref
= STRBUF_INIT
;
798 die("Cannot give description to detached HEAD");
802 branch_name
= argv
[0];
804 usage_with_options(builtin_branch_usage
, options
);
806 strbuf_addf(&branch_ref
, "refs/heads/%s", branch_name
);
807 if (!ref_exists(branch_ref
.buf
)) {
808 strbuf_release(&branch_ref
);
811 return error("No commit on branch '%s' yet.",
814 return error("No such branch '%s'.", branch_name
);
816 strbuf_release(&branch_ref
);
818 if (edit_branch_description(branch_name
))
822 rename_branch(head
, argv
[0], rename
> 1);
824 rename_branch(argv
[0], argv
[1], rename
> 1);
826 usage_with_options(builtin_branch_usage
, options
);
827 } else if (argc
> 0 && argc
<= 2) {
828 if (kinds
!= REF_LOCAL_BRANCH
)
829 die(_("-a and -r options to 'git branch' do not make sense with a branch name"));
830 create_branch(head
, argv
[0], (argc
== 2) ? argv
[1] : head
,
831 force_create
, reflog
, 0, track
);
833 usage_with_options(builtin_branch_usage
, options
);