submodule: Use cat instead of echo to avoid DOS line-endings
[git/dscho.git] / builtin / branch.c
blob27143fb70a61d0e0f9877764eb3b40fe776011ac
1 /*
2 * Builtin "git branch"
4 * Copyright (c) 2006 Kristian Høgsberg <krh@redhat.com>
5 * Based on git-branch.sh by Junio C Hamano.
6 */
8 #include "cache.h"
9 #include "color.h"
10 #include "refs.h"
11 #include "commit.h"
12 #include "builtin.h"
13 #include "remote.h"
14 #include "parse-options.h"
15 #include "branch.h"
16 #include "diff.h"
17 #include "revision.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>",
24 NULL
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] = {
35 GIT_COLOR_RESET,
36 GIT_COLOR_NORMAL, /* PLAIN */
37 GIT_COLOR_RED, /* REMOTE */
38 GIT_COLOR_NORMAL, /* LOCAL */
39 GIT_COLOR_GREEN, /* CURRENT */
41 enum color_branch {
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 {
50 NO_FILTER = 0,
51 SHOW_NOT_MERGED,
52 SHOW_MERGED
53 } 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;
68 return -1;
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);
75 return 0;
77 if (!prefixcmp(var, "color.branch.")) {
78 int slot = parse_branch_color_slot(var, 13);
79 if (slot < 0)
80 return 0;
81 if (!value)
82 return config_error_nonbool(var);
83 color_parse(value, var, branch_colors[slot]);
84 return 0;
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];
93 return "";
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;
107 int merged;
109 if (kind == REF_LOCAL_BRANCH) {
110 struct branch *branch = branch_get(name);
111 unsigned char sha1[20];
113 if (branch &&
114 branch->merge &&
115 branch->merge[0] &&
116 branch->merge[0]->dst &&
117 (reference_name =
118 resolve_ref(branch->merge[0]->dst, sha1, 1, NULL)) != NULL) {
119 reference_name = xstrdup(reference_name);
120 reference_rev = lookup_commit_reference(sha1);
123 if (!reference_rev)
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) {
137 if (merged)
138 warning(_("deleting branch '%s' that has been merged to\n"
139 " '%s', but not yet merged to HEAD."),
140 name, reference_name);
141 else
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);
147 return merged;
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];
154 char *name = NULL;
155 const char *fmt, *remote;
156 int i;
157 int ret = 0;
158 struct strbuf bname = STRBUF_INIT;
160 switch (kinds) {
161 case REF_REMOTE_BRANCH:
162 fmt = "refs/remotes/%s";
163 /* TRANSLATORS: This is "remote " in "remote branch '%s' not found" */
164 remote = _("remote ");
165 force = 1;
166 break;
167 case REF_LOCAL_BRANCH:
168 fmt = "refs/heads/%s";
169 remote = "";
170 break;
171 default:
172 die(_("cannot use -a with -d"));
175 if (!force) {
176 head_rev = lookup_commit_reference(head_sha1);
177 if (!head_rev)
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);
185 ret = 1;
186 continue;
189 free(name);
191 name = xstrdup(mkpath(fmt, bname.buf));
192 if (read_ref(name, sha1)) {
193 error(_("%sbranch '%s' not found."),
194 remote, bname.buf);
195 ret = 1;
196 continue;
199 rev = lookup_commit_reference(sha1);
200 if (!rev) {
201 error(_("Couldn't look up commit object for '%s'"), name);
202 ret = 1;
203 continue;
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);
210 ret = 1;
211 continue;
214 if (delete_ref(name, sha1, 0)) {
215 error(_("Error deleting %sbranch '%s'"), remote,
216 bname.buf);
217 ret = 1;
218 } else {
219 struct strbuf buf = STRBUF_INIT;
220 printf(_("Deleted %sbranch %s (was %s).\n"), remote,
221 bname.buf,
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);
230 free(name);
232 return(ret);
235 struct ref_item {
236 char *name;
237 char *dest;
238 unsigned int kind, len;
239 struct commit *commit;
242 struct ref_list {
243 struct rev_info revs;
244 int index, alloc, maxwidth, verbose, abbrev;
245 struct ref_item *list;
246 struct commit_list *with_commit;
247 int kinds;
250 static char *resolve_symref(const char *src, const char *prefix)
252 unsigned char sha1[20];
253 int flag;
254 const char *dst, *cp;
256 dst = resolve_ref(src, sha1, 0, &flag);
257 if (!(dst && (flag & REF_ISSYMREF)))
258 return NULL;
259 if (prefix && (cp = skip_prefix(dst, prefix)))
260 dst = cp;
261 return xstrdup(dst);
264 struct append_ref_cb {
265 struct ref_list *ref_list;
266 const char **pattern;
267 int ret;
270 static int match_patterns(const char **pattern, const char *refname)
272 if (!*pattern)
273 return 1; /* no pattern always matches */
274 while (*pattern) {
275 if (!fnmatch(*pattern, refname, 0))
276 return 1;
277 pattern++;
279 return 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;
288 int kind, i;
289 const char *prefix, *orig_refname = refname;
291 static struct {
292 int kind;
293 const char *prefix;
294 int pfxlen;
295 } ref_kind[] = {
296 { REF_LOCAL_BRANCH, "refs/heads/", 11 },
297 { REF_REMOTE_BRANCH, "refs/remotes/", 13 },
300 /* Detect kind */
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))
304 continue;
305 kind = ref_kind[i].kind;
306 refname += ref_kind[i].pfxlen;
307 break;
309 if (ARRAY_SIZE(ref_kind) <= i)
310 return 0;
312 /* Don't add types the caller doesn't want */
313 if ((kind & ref_list->kinds) == 0)
314 return 0;
316 if (!match_patterns(cb->pattern, refname))
317 return 0;
319 commit = NULL;
320 if (ref_list->verbose || ref_list->with_commit || merge_filter != NO_FILTER) {
321 commit = lookup_commit_reference_gently(sha1, 1);
322 if (!commit) {
323 cb->ret = error(_("branch '%s' does not point at a commit"), refname);
324 return 0;
327 /* Filter with with_commit if specified */
328 if (!is_descendant_of(commit, ref_list->with_commit))
329 return 0;
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)
348 newitem->len += 8;
349 if (newitem->len > ref_list->maxwidth)
350 ref_list->maxwidth = newitem->len;
352 return 0;
355 static void free_ref_list(struct ref_list *ref_list)
357 int i;
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)
379 int ours, theirs;
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 &&
384 show_upstream_ref)
385 strbuf_addf(stat, "[%s] ",
386 shorten_unambiguous_ref(branch->merge[0]->dst, 0));
387 return;
390 strbuf_addch(stat, '[');
391 if (show_upstream_ref)
392 strbuf_addf(stat, "%s: ",
393 shorten_unambiguous_ref(branch->merge[0]->dst, 0));
394 if (!ours)
395 strbuf_addf(stat, _("behind %d] "), theirs);
396 else if (!theirs)
397 strbuf_addf(stat, _("ahead %d] "), ours);
398 else
399 strbuf_addf(stat, _("ahead %d, behind %d] "), ours, theirs);
402 static int matches_merge_filter(struct commit *commit)
404 int is_merged;
406 if (merge_filter == NO_FILTER)
407 return 1;
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);
422 sub = subject.buf;
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),
430 stat.buf, sub);
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)
438 char c;
439 int color;
440 struct commit *commit = item->commit;
441 struct strbuf out = STRBUF_INIT, name = STRBUF_INIT;
443 if (!matches_merge_filter(commit))
444 return;
446 switch (item->kind) {
447 case REF_LOCAL_BRANCH:
448 color = BRANCH_COLOR_LOCAL;
449 break;
450 case REF_REMOTE_BRANCH:
451 color = BRANCH_COLOR_REMOTE;
452 break;
453 default:
454 color = BRANCH_COLOR_PLAIN;
455 break;
458 c = ' ';
459 if (current) {
460 c = '*';
461 color = BRANCH_COLOR_CURRENT;
464 strbuf_addf(&name, "%s%s", prefix, item->name);
465 if (verbose)
466 strbuf_addf(&out, "%c %s%-*s%s", c, branch_get_color(color),
467 maxwidth, name.buf,
468 branch_get_color(BRANCH_COLOR_RESET));
469 else
470 strbuf_addf(&out, "%c %s%s%s", c, branch_get_color(color),
471 name.buf, branch_get_color(BRANCH_COLOR_RESET));
473 if (item->dest)
474 strbuf_addf(&out, " -> %s", item->dest);
475 else if (verbose)
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)
485 int i, w = 0;
486 for (i = 0; i < refs->index; i++) {
487 if (!matches_merge_filter(refs->list[i].commit))
488 continue;
489 if (refs->list[i].len > w)
490 w = refs->list[i].len;
492 return w;
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;
505 item.dest = NULL;
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, "");
510 free(item.name);
514 static int print_ref_list(int kinds, int detached, int verbose, int abbrev, struct commit_list *with_commit, const char **pattern)
516 int i;
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;
529 cb.ret = 0;
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);
539 if (verbose)
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)
555 ? "remotes/" : "";
556 print_ref_item(&ref_list.list[i], ref_list.maxwidth, verbose,
557 abbrev, current, prefix);
560 free_ref_list(&ref_list);
562 if (cb.ret)
563 error(_("some refs could not be read"));
565 return cb.ret;
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;
572 int recovery = 0;
574 if (!oldname)
575 die(_("cannot rename the current branch while not on any."));
577 if (strbuf_check_branch_ref(&oldref, oldname)) {
579 * Bad name --- this could be an attempt to rename a
580 * ref that we used to allow to be created by accident.
582 if (ref_exists(oldref.buf))
583 recovery = 1;
584 else
585 die(_("Invalid branch name: '%s'"), oldname);
588 validate_new_branchname(newname, &newref, force, 0);
590 strbuf_addf(&logmsg, "Branch: renamed %s to %s",
591 oldref.buf, newref.buf);
593 if (rename_ref(oldref.buf, newref.buf, logmsg.buf))
594 die(_("Branch rename failed"));
595 strbuf_release(&logmsg);
597 if (recovery)
598 warning(_("Renamed a misnamed branch '%s' away"), oldref.buf + 11);
600 /* no need to pass logmsg here as HEAD didn't really move */
601 if (!strcmp(oldname, head) && create_symref("HEAD", newref.buf, NULL))
602 die(_("Branch renamed to %s, but HEAD is not updated!"), newname);
604 strbuf_addf(&oldsection, "branch.%s", oldref.buf + 11);
605 strbuf_release(&oldref);
606 strbuf_addf(&newsection, "branch.%s", newref.buf + 11);
607 strbuf_release(&newref);
608 if (git_config_rename_section(oldsection.buf, newsection.buf) < 0)
609 die(_("Branch is renamed, but update of config-file failed"));
610 strbuf_release(&oldsection);
611 strbuf_release(&newsection);
614 static int opt_parse_merge_filter(const struct option *opt, const char *arg, int unset)
616 merge_filter = ((opt->long_name[0] == 'n')
617 ? SHOW_NOT_MERGED
618 : SHOW_MERGED);
619 if (unset)
620 merge_filter = SHOW_NOT_MERGED; /* b/c for --no-merged */
621 if (!arg)
622 arg = "HEAD";
623 if (get_sha1(arg, merge_filter_ref))
624 die(_("malformed object name %s"), arg);
625 return 0;
628 static const char edit_description[] = "BRANCH_DESCRIPTION";
630 static int edit_branch_description(const char *branch_name)
632 FILE *fp;
633 int status;
634 struct strbuf buf = STRBUF_INIT;
635 struct strbuf name = STRBUF_INIT;
637 read_branch_desc(&buf, branch_name);
638 if (!buf.len || buf.buf[buf.len-1] != '\n')
639 strbuf_addch(&buf, '\n');
640 strbuf_addf(&buf,
641 "# Please edit the description for the branch\n"
642 "# %s\n"
643 "# Lines starting with '#' will be stripped.\n",
644 branch_name);
645 fp = fopen(git_path(edit_description), "w");
646 if ((fwrite(buf.buf, 1, buf.len, fp) < buf.len) || fclose(fp)) {
647 strbuf_release(&buf);
648 return error(_("could not write branch description template: %s\n"),
649 strerror(errno));
651 strbuf_reset(&buf);
652 if (launch_editor(git_path(edit_description), &buf, NULL)) {
653 strbuf_release(&buf);
654 return -1;
656 stripspace(&buf, 1);
658 strbuf_addf(&name, "branch.%s.description", branch_name);
659 status = git_config_set(name.buf, buf.buf);
660 strbuf_release(&name);
661 strbuf_release(&buf);
663 return status;
666 int cmd_branch(int argc, const char **argv, const char *prefix)
668 int delete = 0, rename = 0, force_create = 0, list = 0;
669 int verbose = 0, abbrev = -1, detached = 0;
670 int reflog = 0, edit_description = 0;
671 enum branch_track track;
672 int kinds = REF_LOCAL_BRANCH;
673 struct commit_list *with_commit = NULL;
675 struct option options[] = {
676 OPT_GROUP("Generic options"),
677 OPT__VERBOSE(&verbose,
678 "show hash and subject, give twice for upstream branch"),
679 OPT_SET_INT('t', "track", &track, "set up tracking mode (see git-pull(1))",
680 BRANCH_TRACK_EXPLICIT),
681 OPT_SET_INT( 0, "set-upstream", &track, "change upstream info",
682 BRANCH_TRACK_OVERRIDE),
683 OPT__COLOR(&branch_use_color, "use colored output"),
684 OPT_SET_INT('r', "remotes", &kinds, "act on remote-tracking branches",
685 REF_REMOTE_BRANCH),
687 OPTION_CALLBACK, 0, "contains", &with_commit, "commit",
688 "print only branches that contain the commit",
689 PARSE_OPT_LASTARG_DEFAULT,
690 parse_opt_with_commit, (intptr_t)"HEAD",
693 OPTION_CALLBACK, 0, "with", &with_commit, "commit",
694 "print only branches that contain the commit",
695 PARSE_OPT_HIDDEN | PARSE_OPT_LASTARG_DEFAULT,
696 parse_opt_with_commit, (intptr_t) "HEAD",
698 OPT__ABBREV(&abbrev),
700 OPT_GROUP("Specific git-branch actions:"),
701 OPT_SET_INT('a', "all", &kinds, "list both remote-tracking and local branches",
702 REF_REMOTE_BRANCH | REF_LOCAL_BRANCH),
703 OPT_BIT('d', "delete", &delete, "delete fully merged branch", 1),
704 OPT_BIT('D', NULL, &delete, "delete branch (even if not merged)", 2),
705 OPT_BIT('m', "move", &rename, "move/rename a branch and its reflog", 1),
706 OPT_BIT('M', NULL, &rename, "move/rename a branch, even if target exists", 2),
707 OPT_BOOLEAN(0, "list", &list, "list branch names"),
708 OPT_BOOLEAN('l', "create-reflog", &reflog, "create the branch's reflog"),
709 OPT_BOOLEAN(0, "edit-description", &edit_description,
710 "edit the description for the branch"),
711 OPT__FORCE(&force_create, "force creation (when already exists)"),
713 OPTION_CALLBACK, 0, "no-merged", &merge_filter_ref,
714 "commit", "print only not merged branches",
715 PARSE_OPT_LASTARG_DEFAULT | PARSE_OPT_NONEG,
716 opt_parse_merge_filter, (intptr_t) "HEAD",
719 OPTION_CALLBACK, 0, "merged", &merge_filter_ref,
720 "commit", "print only merged branches",
721 PARSE_OPT_LASTARG_DEFAULT | PARSE_OPT_NONEG,
722 opt_parse_merge_filter, (intptr_t) "HEAD",
724 OPT_END(),
727 if (argc == 2 && !strcmp(argv[1], "-h"))
728 usage_with_options(builtin_branch_usage, options);
730 git_config(git_branch_config, NULL);
732 track = git_branch_track;
734 head = resolve_ref("HEAD", head_sha1, 0, NULL);
735 if (!head)
736 die(_("Failed to resolve HEAD as a valid ref."));
737 head = xstrdup(head);
738 if (!strcmp(head, "HEAD")) {
739 detached = 1;
740 } else {
741 if (prefixcmp(head, "refs/heads/"))
742 die(_("HEAD not found below refs/heads!"));
743 head += 11;
745 hashcpy(merge_filter_ref, head_sha1);
747 argc = parse_options(argc, argv, prefix, options, builtin_branch_usage,
750 if (!delete && !rename && !edit_description && argc == 0)
751 list = 1;
753 if (!!delete + !!rename + !!force_create + !!list > 1)
754 usage_with_options(builtin_branch_usage, options);
756 if (abbrev == -1)
757 abbrev = DEFAULT_ABBREV;
759 if (delete)
760 return delete_branches(argc, argv, delete > 1, kinds);
761 else if (list)
762 return print_ref_list(kinds, detached, verbose, abbrev,
763 with_commit, argv);
764 else if (edit_description) {
765 const char *branch_name;
766 if (detached)
767 die("Cannot give description to detached HEAD");
768 if (!argc)
769 branch_name = head;
770 else if (argc == 1)
771 branch_name = argv[0];
772 else
773 usage_with_options(builtin_branch_usage, options);
774 if (edit_branch_description(branch_name))
775 return 1;
776 } else if (rename) {
777 if (argc == 1)
778 rename_branch(head, argv[0], rename > 1);
779 else if (argc == 2)
780 rename_branch(argv[0], argv[1], rename > 1);
781 else
782 usage_with_options(builtin_branch_usage, options);
783 } else if (argc > 0 && argc <= 2) {
784 if (kinds != REF_LOCAL_BRANCH)
785 die(_("-a and -r options to 'git branch' do not make sense with a branch name"));
786 create_branch(head, argv[0], (argc == 2) ? argv[1] : head,
787 force_create, reflog, track);
788 } else
789 usage_with_options(builtin_branch_usage, options);
791 return 0;