branch: use BRANCH_COLOR_LOCAL in ref-filter format
[alt-git.git] / builtin / branch.c
blobb660ec558e5009e00b82da19315245617ff00431
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"
18 #include "string-list.h"
19 #include "column.h"
20 #include "utf8.h"
21 #include "wt-status.h"
22 #include "ref-filter.h"
23 #include "worktree.h"
25 static const char * const builtin_branch_usage[] = {
26 N_("git branch [<options>] [-r | -a] [--merged | --no-merged]"),
27 N_("git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"),
28 N_("git branch [<options>] [-r] (-d | -D) <branch-name>..."),
29 N_("git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"),
30 N_("git branch [<options>] [-r | -a] [--points-at]"),
31 N_("git branch [<options>] [-r | -a] [--format]"),
32 NULL
35 static const char *head;
36 static unsigned char head_sha1[20];
38 static int branch_use_color = -1;
39 static char branch_colors[][COLOR_MAXLEN] = {
40 GIT_COLOR_RESET,
41 GIT_COLOR_NORMAL, /* PLAIN */
42 GIT_COLOR_RED, /* REMOTE */
43 GIT_COLOR_NORMAL, /* LOCAL */
44 GIT_COLOR_GREEN, /* CURRENT */
45 GIT_COLOR_BLUE, /* UPSTREAM */
47 enum color_branch {
48 BRANCH_COLOR_RESET = 0,
49 BRANCH_COLOR_PLAIN = 1,
50 BRANCH_COLOR_REMOTE = 2,
51 BRANCH_COLOR_LOCAL = 3,
52 BRANCH_COLOR_CURRENT = 4,
53 BRANCH_COLOR_UPSTREAM = 5
56 static struct string_list output = STRING_LIST_INIT_DUP;
57 static unsigned int colopts;
59 static int parse_branch_color_slot(const char *slot)
61 if (!strcasecmp(slot, "plain"))
62 return BRANCH_COLOR_PLAIN;
63 if (!strcasecmp(slot, "reset"))
64 return BRANCH_COLOR_RESET;
65 if (!strcasecmp(slot, "remote"))
66 return BRANCH_COLOR_REMOTE;
67 if (!strcasecmp(slot, "local"))
68 return BRANCH_COLOR_LOCAL;
69 if (!strcasecmp(slot, "current"))
70 return BRANCH_COLOR_CURRENT;
71 if (!strcasecmp(slot, "upstream"))
72 return BRANCH_COLOR_UPSTREAM;
73 return -1;
76 static int git_branch_config(const char *var, const char *value, void *cb)
78 const char *slot_name;
80 if (starts_with(var, "column."))
81 return git_column_config(var, value, "branch", &colopts);
82 if (!strcmp(var, "color.branch")) {
83 branch_use_color = git_config_colorbool(var, value);
84 return 0;
86 if (skip_prefix(var, "color.branch.", &slot_name)) {
87 int slot = parse_branch_color_slot(slot_name);
88 if (slot < 0)
89 return 0;
90 if (!value)
91 return config_error_nonbool(var);
92 return color_parse(value, branch_colors[slot]);
94 return git_color_default_config(var, value, cb);
97 static const char *branch_get_color(enum color_branch ix)
99 if (want_color(branch_use_color))
100 return branch_colors[ix];
101 return "";
104 static int branch_merged(int kind, const char *name,
105 struct commit *rev, struct commit *head_rev)
108 * This checks whether the merge bases of branch and HEAD (or
109 * the other branch this branch builds upon) contains the
110 * branch, which means that the branch has already been merged
111 * safely to HEAD (or the other branch).
113 struct commit *reference_rev = NULL;
114 const char *reference_name = NULL;
115 void *reference_name_to_free = NULL;
116 int merged;
118 if (kind == FILTER_REFS_BRANCHES) {
119 struct branch *branch = branch_get(name);
120 const char *upstream = branch_get_upstream(branch, NULL);
121 unsigned char sha1[20];
123 if (upstream &&
124 (reference_name = reference_name_to_free =
125 resolve_refdup(upstream, RESOLVE_REF_READING,
126 sha1, NULL)) != NULL)
127 reference_rev = lookup_commit_reference(sha1);
129 if (!reference_rev)
130 reference_rev = head_rev;
132 merged = in_merge_bases(rev, reference_rev);
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) != merged) {
143 if (merged)
144 warning(_("deleting branch '%s' that has been merged to\n"
145 " '%s', but not yet merged to HEAD."),
146 name, reference_name);
147 else
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);
153 return merged;
156 static int check_branch_commit(const char *branchname, const char *refname,
157 const unsigned char *sha1, struct commit *head_rev,
158 int kinds, int force)
160 struct commit *rev = lookup_commit_reference(sha1);
161 if (!rev) {
162 error(_("Couldn't look up commit object for '%s'"), refname);
163 return -1;
165 if (!force && !branch_merged(kinds, branchname, rev, head_rev)) {
166 error(_("The branch '%s' is not fully merged.\n"
167 "If you are sure you want to delete it, "
168 "run 'git branch -D %s'."), branchname, branchname);
169 return -1;
171 return 0;
174 static void delete_branch_config(const char *branchname)
176 struct strbuf buf = STRBUF_INIT;
177 strbuf_addf(&buf, "branch.%s", branchname);
178 if (git_config_rename_section(buf.buf, NULL) < 0)
179 warning(_("Update of config-file failed"));
180 strbuf_release(&buf);
183 static int delete_branches(int argc, const char **argv, int force, int kinds,
184 int quiet)
186 struct commit *head_rev = NULL;
187 unsigned char sha1[20];
188 char *name = NULL;
189 const char *fmt;
190 int i;
191 int ret = 0;
192 int remote_branch = 0;
193 struct strbuf bname = STRBUF_INIT;
195 switch (kinds) {
196 case FILTER_REFS_REMOTES:
197 fmt = "refs/remotes/%s";
198 /* For subsequent UI messages */
199 remote_branch = 1;
201 force = 1;
202 break;
203 case FILTER_REFS_BRANCHES:
204 fmt = "refs/heads/%s";
205 break;
206 default:
207 die(_("cannot use -a with -d"));
210 if (!force) {
211 head_rev = lookup_commit_reference(head_sha1);
212 if (!head_rev)
213 die(_("Couldn't look up commit object for HEAD"));
215 for (i = 0; i < argc; i++, strbuf_release(&bname)) {
216 char *target = NULL;
217 int flags = 0;
219 strbuf_branchname(&bname, argv[i]);
220 free(name);
221 name = mkpathdup(fmt, bname.buf);
223 if (kinds == FILTER_REFS_BRANCHES) {
224 const struct worktree *wt =
225 find_shared_symref("HEAD", name);
226 if (wt) {
227 error(_("Cannot delete branch '%s' "
228 "checked out at '%s'"),
229 bname.buf, wt->path);
230 ret = 1;
231 continue;
235 target = resolve_refdup(name,
236 RESOLVE_REF_READING
237 | RESOLVE_REF_NO_RECURSE
238 | RESOLVE_REF_ALLOW_BAD_NAME,
239 sha1, &flags);
240 if (!target) {
241 error(remote_branch
242 ? _("remote-tracking branch '%s' not found.")
243 : _("branch '%s' not found."), bname.buf);
244 ret = 1;
245 continue;
248 if (!(flags & (REF_ISSYMREF|REF_ISBROKEN)) &&
249 check_branch_commit(bname.buf, name, sha1, head_rev, kinds,
250 force)) {
251 ret = 1;
252 goto next;
255 if (delete_ref(name, is_null_sha1(sha1) ? NULL : sha1,
256 REF_NODEREF)) {
257 error(remote_branch
258 ? _("Error deleting remote-tracking branch '%s'")
259 : _("Error deleting branch '%s'"),
260 bname.buf);
261 ret = 1;
262 goto next;
264 if (!quiet) {
265 printf(remote_branch
266 ? _("Deleted remote-tracking branch %s (was %s).\n")
267 : _("Deleted branch %s (was %s).\n"),
268 bname.buf,
269 (flags & REF_ISBROKEN) ? "broken"
270 : (flags & REF_ISSYMREF) ? target
271 : find_unique_abbrev(sha1, DEFAULT_ABBREV));
273 delete_branch_config(bname.buf);
275 next:
276 free(target);
279 free(name);
281 return(ret);
284 static int calc_maxwidth(struct ref_array *refs, int remote_bonus)
286 int i, max = 0;
287 for (i = 0; i < refs->nr; i++) {
288 struct ref_array_item *it = refs->items[i];
289 const char *desc = it->refname;
290 int w;
292 skip_prefix(it->refname, "refs/heads/", &desc);
293 skip_prefix(it->refname, "refs/remotes/", &desc);
294 if (it->kind == FILTER_REFS_DETACHED_HEAD) {
295 char *head_desc = get_head_description();
296 w = utf8_strwidth(head_desc);
297 free(head_desc);
298 } else
299 w = utf8_strwidth(desc);
301 if (it->kind == FILTER_REFS_REMOTES)
302 w += remote_bonus;
303 if (w > max)
304 max = w;
306 return max;
309 static const char *quote_literal_for_format(const char *s)
311 static struct strbuf buf = STRBUF_INIT;
313 strbuf_reset(&buf);
314 while (*s) {
315 const char *ep = strchrnul(s, '%');
316 if (s < ep)
317 strbuf_add(&buf, s, ep - s);
318 if (*ep == '%') {
319 strbuf_addstr(&buf, "%%");
320 s = ep + 1;
321 } else {
322 s = ep;
325 return buf.buf;
328 static char *build_format(struct ref_filter *filter, int maxwidth, const char *remote_prefix)
330 struct strbuf fmt = STRBUF_INIT;
331 struct strbuf local = STRBUF_INIT;
332 struct strbuf remote = STRBUF_INIT;
334 strbuf_addf(&local, "%%(if)%%(HEAD)%%(then)* %s%%(else) %s%%(end)",
335 branch_get_color(BRANCH_COLOR_CURRENT),
336 branch_get_color(BRANCH_COLOR_LOCAL));
337 strbuf_addf(&remote, " ");
339 if (filter->verbose) {
340 struct strbuf obname = STRBUF_INIT;
342 if (filter->abbrev < 0)
343 strbuf_addf(&obname, "%%(objectname:short)");
344 else if (!filter->abbrev)
345 strbuf_addf(&obname, "%%(objectname)");
346 else
347 strbuf_addf(&obname, "%%(objectname:short=%d)", filter->abbrev);
349 strbuf_addf(&local, "%%(align:%d,left)%%(refname:lstrip=2)%%(end)", maxwidth);
350 strbuf_addf(&local, "%s", branch_get_color(BRANCH_COLOR_RESET));
351 strbuf_addf(&local, " %s ", obname.buf);
353 if (filter->verbose > 1)
354 strbuf_addf(&local, "%%(if)%%(upstream)%%(then)[%s%%(upstream:short)%s%%(if)%%(upstream:track)"
355 "%%(then): %%(upstream:track,nobracket)%%(end)] %%(end)%%(contents:subject)",
356 branch_get_color(BRANCH_COLOR_UPSTREAM), branch_get_color(BRANCH_COLOR_RESET));
357 else
358 strbuf_addf(&local, "%%(if)%%(upstream:track)%%(then)%%(upstream:track) %%(end)%%(contents:subject)");
360 strbuf_addf(&remote, "%s%%(align:%d,left)%s%%(refname:lstrip=2)%%(end)%s"
361 "%%(if)%%(symref)%%(then) -> %%(symref:short)"
362 "%%(else) %s %%(contents:subject)%%(end)",
363 branch_get_color(BRANCH_COLOR_REMOTE), maxwidth, quote_literal_for_format(remote_prefix),
364 branch_get_color(BRANCH_COLOR_RESET), obname.buf);
365 strbuf_release(&obname);
366 } else {
367 strbuf_addf(&local, "%%(refname:lstrip=2)%s%%(if)%%(symref)%%(then) -> %%(symref:short)%%(end)",
368 branch_get_color(BRANCH_COLOR_RESET));
369 strbuf_addf(&remote, "%s%s%%(refname:lstrip=2)%s%%(if)%%(symref)%%(then) -> %%(symref:short)%%(end)",
370 branch_get_color(BRANCH_COLOR_REMOTE), quote_literal_for_format(remote_prefix),
371 branch_get_color(BRANCH_COLOR_RESET));
374 strbuf_addf(&fmt, "%%(if:notequals=refs/remotes)%%(refname:rstrip=-2)%%(then)%s%%(else)%s%%(end)", local.buf, remote.buf);
376 strbuf_release(&local);
377 strbuf_release(&remote);
378 return strbuf_detach(&fmt, NULL);
381 static void print_ref_list(struct ref_filter *filter, struct ref_sorting *sorting, const char *format)
383 int i;
384 struct ref_array array;
385 int maxwidth = 0;
386 const char *remote_prefix = "";
387 struct strbuf out = STRBUF_INIT;
388 char *to_free = NULL;
391 * If we are listing more than just remote branches,
392 * then remote branches will have a "remotes/" prefix.
393 * We need to account for this in the width.
395 if (filter->kind != FILTER_REFS_REMOTES)
396 remote_prefix = "remotes/";
398 memset(&array, 0, sizeof(array));
400 filter_refs(&array, filter, filter->kind | FILTER_REFS_INCLUDE_BROKEN);
402 if (filter->verbose)
403 maxwidth = calc_maxwidth(&array, strlen(remote_prefix));
405 if (!format)
406 format = to_free = build_format(filter, maxwidth, remote_prefix);
407 verify_ref_format(format);
409 ref_array_sort(sorting, &array);
411 for (i = 0; i < array.nr; i++) {
412 format_ref_array_item(array.items[i], format, 0, &out);
413 if (column_active(colopts)) {
414 assert(!filter->verbose && "--column and --verbose are incompatible");
415 /* format to a string_list to let print_columns() do its job */
416 string_list_append(&output, out.buf);
417 } else {
418 fwrite(out.buf, 1, out.len, stdout);
419 putchar('\n');
421 strbuf_release(&out);
424 ref_array_clear(&array);
425 free(to_free);
428 static void reject_rebase_or_bisect_branch(const char *target)
430 struct worktree **worktrees = get_worktrees(0);
431 int i;
433 for (i = 0; worktrees[i]; i++) {
434 struct worktree *wt = worktrees[i];
436 if (!wt->is_detached)
437 continue;
439 if (is_worktree_being_rebased(wt, target))
440 die(_("Branch %s is being rebased at %s"),
441 target, wt->path);
443 if (is_worktree_being_bisected(wt, target))
444 die(_("Branch %s is being bisected at %s"),
445 target, wt->path);
448 free_worktrees(worktrees);
451 static void rename_branch(const char *oldname, const char *newname, int force)
453 struct strbuf oldref = STRBUF_INIT, newref = STRBUF_INIT, logmsg = STRBUF_INIT;
454 struct strbuf oldsection = STRBUF_INIT, newsection = STRBUF_INIT;
455 int recovery = 0;
456 int clobber_head_ok;
458 if (!oldname)
459 die(_("cannot rename the current branch while not on any."));
461 if (strbuf_check_branch_ref(&oldref, oldname)) {
463 * Bad name --- this could be an attempt to rename a
464 * ref that we used to allow to be created by accident.
466 if (ref_exists(oldref.buf))
467 recovery = 1;
468 else
469 die(_("Invalid branch name: '%s'"), oldname);
473 * A command like "git branch -M currentbranch currentbranch" cannot
474 * cause the worktree to become inconsistent with HEAD, so allow it.
476 clobber_head_ok = !strcmp(oldname, newname);
478 validate_new_branchname(newname, &newref, force, clobber_head_ok);
480 reject_rebase_or_bisect_branch(oldref.buf);
482 strbuf_addf(&logmsg, "Branch: renamed %s to %s",
483 oldref.buf, newref.buf);
485 if (rename_ref(oldref.buf, newref.buf, logmsg.buf))
486 die(_("Branch rename failed"));
487 strbuf_release(&logmsg);
489 if (recovery)
490 warning(_("Renamed a misnamed branch '%s' away"), oldref.buf + 11);
492 if (replace_each_worktree_head_symref(oldref.buf, newref.buf))
493 die(_("Branch renamed to %s, but HEAD is not updated!"), newname);
495 strbuf_addf(&oldsection, "branch.%s", oldref.buf + 11);
496 strbuf_release(&oldref);
497 strbuf_addf(&newsection, "branch.%s", newref.buf + 11);
498 strbuf_release(&newref);
499 if (git_config_rename_section(oldsection.buf, newsection.buf) < 0)
500 die(_("Branch is renamed, but update of config-file failed"));
501 strbuf_release(&oldsection);
502 strbuf_release(&newsection);
505 static const char edit_description[] = "BRANCH_DESCRIPTION";
507 static int edit_branch_description(const char *branch_name)
509 struct strbuf buf = STRBUF_INIT;
510 struct strbuf name = STRBUF_INIT;
512 read_branch_desc(&buf, branch_name);
513 if (!buf.len || buf.buf[buf.len-1] != '\n')
514 strbuf_addch(&buf, '\n');
515 strbuf_commented_addf(&buf,
516 _("Please edit the description for the branch\n"
517 " %s\n"
518 "Lines starting with '%c' will be stripped.\n"),
519 branch_name, comment_line_char);
520 write_file_buf(git_path(edit_description), buf.buf, buf.len);
521 strbuf_reset(&buf);
522 if (launch_editor(git_path(edit_description), &buf, NULL)) {
523 strbuf_release(&buf);
524 return -1;
526 strbuf_stripspace(&buf, 1);
528 strbuf_addf(&name, "branch.%s.description", branch_name);
529 git_config_set(name.buf, buf.len ? buf.buf : NULL);
530 strbuf_release(&name);
531 strbuf_release(&buf);
533 return 0;
536 int cmd_branch(int argc, const char **argv, const char *prefix)
538 int delete = 0, rename = 0, force = 0, list = 0;
539 int reflog = 0, edit_description = 0;
540 int quiet = 0, unset_upstream = 0;
541 const char *new_upstream = NULL;
542 enum branch_track track;
543 struct ref_filter filter;
544 int icase = 0;
545 static struct ref_sorting *sorting = NULL, **sorting_tail = &sorting;
546 const char *format = NULL;
548 struct option options[] = {
549 OPT_GROUP(N_("Generic options")),
550 OPT__VERBOSE(&filter.verbose,
551 N_("show hash and subject, give twice for upstream branch")),
552 OPT__QUIET(&quiet, N_("suppress informational messages")),
553 OPT_SET_INT('t', "track", &track, N_("set up tracking mode (see git-pull(1))"),
554 BRANCH_TRACK_EXPLICIT),
555 OPT_SET_INT( 0, "set-upstream", &track, N_("change upstream info"),
556 BRANCH_TRACK_OVERRIDE),
557 OPT_STRING('u', "set-upstream-to", &new_upstream, N_("upstream"), N_("change the upstream info")),
558 OPT_BOOL(0, "unset-upstream", &unset_upstream, N_("Unset the upstream info")),
559 OPT__COLOR(&branch_use_color, N_("use colored output")),
560 OPT_SET_INT('r', "remotes", &filter.kind, N_("act on remote-tracking branches"),
561 FILTER_REFS_REMOTES),
562 OPT_CONTAINS(&filter.with_commit, N_("print only branches that contain the commit")),
563 OPT_WITH(&filter.with_commit, N_("print only branches that contain the commit")),
564 OPT__ABBREV(&filter.abbrev),
566 OPT_GROUP(N_("Specific git-branch actions:")),
567 OPT_SET_INT('a', "all", &filter.kind, N_("list both remote-tracking and local branches"),
568 FILTER_REFS_REMOTES | FILTER_REFS_BRANCHES),
569 OPT_BIT('d', "delete", &delete, N_("delete fully merged branch"), 1),
570 OPT_BIT('D', NULL, &delete, N_("delete branch (even if not merged)"), 2),
571 OPT_BIT('m', "move", &rename, N_("move/rename a branch and its reflog"), 1),
572 OPT_BIT('M', NULL, &rename, N_("move/rename a branch, even if target exists"), 2),
573 OPT_BOOL(0, "list", &list, N_("list branch names")),
574 OPT_BOOL('l', "create-reflog", &reflog, N_("create the branch's reflog")),
575 OPT_BOOL(0, "edit-description", &edit_description,
576 N_("edit the description for the branch")),
577 OPT__FORCE(&force, N_("force creation, move/rename, deletion")),
578 OPT_MERGED(&filter, N_("print only branches that are merged")),
579 OPT_NO_MERGED(&filter, N_("print only branches that are not merged")),
580 OPT_COLUMN(0, "column", &colopts, N_("list branches in columns")),
581 OPT_CALLBACK(0 , "sort", sorting_tail, N_("key"),
582 N_("field name to sort on"), &parse_opt_ref_sorting),
584 OPTION_CALLBACK, 0, "points-at", &filter.points_at, N_("object"),
585 N_("print only branches of the object"), 0, parse_opt_object_name
587 OPT_BOOL('i', "ignore-case", &icase, N_("sorting and filtering are case insensitive")),
588 OPT_STRING( 0 , "format", &format, N_("format"), N_("format to use for the output")),
589 OPT_END(),
592 setup_ref_filter_porcelain_msg();
594 memset(&filter, 0, sizeof(filter));
595 filter.kind = FILTER_REFS_BRANCHES;
596 filter.abbrev = -1;
598 if (argc == 2 && !strcmp(argv[1], "-h"))
599 usage_with_options(builtin_branch_usage, options);
601 git_config(git_branch_config, NULL);
603 track = git_branch_track;
605 head = resolve_refdup("HEAD", 0, head_sha1, NULL);
606 if (!head)
607 die(_("Failed to resolve HEAD as a valid ref."));
608 if (!strcmp(head, "HEAD"))
609 filter.detached = 1;
610 else if (!skip_prefix(head, "refs/heads/", &head))
611 die(_("HEAD not found below refs/heads!"));
613 argc = parse_options(argc, argv, prefix, options, builtin_branch_usage,
616 if (!delete && !rename && !edit_description && !new_upstream && !unset_upstream && argc == 0)
617 list = 1;
619 if (filter.with_commit || filter.merge != REF_FILTER_MERGED_NONE || filter.points_at.nr)
620 list = 1;
622 if (!!delete + !!rename + !!new_upstream +
623 list + unset_upstream > 1)
624 usage_with_options(builtin_branch_usage, options);
626 if (filter.abbrev == -1)
627 filter.abbrev = DEFAULT_ABBREV;
628 filter.ignore_case = icase;
630 finalize_colopts(&colopts, -1);
631 if (filter.verbose) {
632 if (explicitly_enable_column(colopts))
633 die(_("--column and --verbose are incompatible"));
634 colopts = 0;
637 if (force) {
638 delete *= 2;
639 rename *= 2;
642 if (delete) {
643 if (!argc)
644 die(_("branch name required"));
645 return delete_branches(argc, argv, delete > 1, filter.kind, quiet);
646 } else if (list) {
647 /* git branch --local also shows HEAD when it is detached */
648 if ((filter.kind & FILTER_REFS_BRANCHES) && filter.detached)
649 filter.kind |= FILTER_REFS_DETACHED_HEAD;
650 filter.name_patterns = argv;
652 * If no sorting parameter is given then we default to sorting
653 * by 'refname'. This would give us an alphabetically sorted
654 * array with the 'HEAD' ref at the beginning followed by
655 * local branches 'refs/heads/...' and finally remote-tacking
656 * branches 'refs/remotes/...'.
658 if (!sorting)
659 sorting = ref_default_sorting();
660 sorting->ignore_case = icase;
661 print_ref_list(&filter, sorting, format);
662 print_columns(&output, colopts, NULL);
663 string_list_clear(&output, 0);
664 return 0;
666 else if (edit_description) {
667 const char *branch_name;
668 struct strbuf branch_ref = STRBUF_INIT;
670 if (!argc) {
671 if (filter.detached)
672 die(_("Cannot give description to detached HEAD"));
673 branch_name = head;
674 } else if (argc == 1)
675 branch_name = argv[0];
676 else
677 die(_("cannot edit description of more than one branch"));
679 strbuf_addf(&branch_ref, "refs/heads/%s", branch_name);
680 if (!ref_exists(branch_ref.buf)) {
681 strbuf_release(&branch_ref);
683 if (!argc)
684 return error(_("No commit on branch '%s' yet."),
685 branch_name);
686 else
687 return error(_("No branch named '%s'."),
688 branch_name);
690 strbuf_release(&branch_ref);
692 if (edit_branch_description(branch_name))
693 return 1;
694 } else if (rename) {
695 if (!argc)
696 die(_("branch name required"));
697 else if (argc == 1)
698 rename_branch(head, argv[0], rename > 1);
699 else if (argc == 2)
700 rename_branch(argv[0], argv[1], rename > 1);
701 else
702 die(_("too many branches for a rename operation"));
703 } else if (new_upstream) {
704 struct branch *branch = branch_get(argv[0]);
706 if (argc > 1)
707 die(_("too many branches to set new upstream"));
709 if (!branch) {
710 if (!argc || !strcmp(argv[0], "HEAD"))
711 die(_("could not set upstream of HEAD to %s when "
712 "it does not point to any branch."),
713 new_upstream);
714 die(_("no such branch '%s'"), argv[0]);
717 if (!ref_exists(branch->refname))
718 die(_("branch '%s' does not exist"), branch->name);
721 * create_branch takes care of setting up the tracking
722 * info and making sure new_upstream is correct
724 create_branch(branch->name, new_upstream, 0, 0, 0, quiet, BRANCH_TRACK_OVERRIDE);
725 } else if (unset_upstream) {
726 struct branch *branch = branch_get(argv[0]);
727 struct strbuf buf = STRBUF_INIT;
729 if (argc > 1)
730 die(_("too many branches to unset upstream"));
732 if (!branch) {
733 if (!argc || !strcmp(argv[0], "HEAD"))
734 die(_("could not unset upstream of HEAD when "
735 "it does not point to any branch."));
736 die(_("no such branch '%s'"), argv[0]);
739 if (!branch_has_merge_config(branch))
740 die(_("Branch '%s' has no upstream information"), branch->name);
742 strbuf_addf(&buf, "branch.%s.remote", branch->name);
743 git_config_set_multivar(buf.buf, NULL, NULL, 1);
744 strbuf_reset(&buf);
745 strbuf_addf(&buf, "branch.%s.merge", branch->name);
746 git_config_set_multivar(buf.buf, NULL, NULL, 1);
747 strbuf_release(&buf);
748 } else if (argc > 0 && argc <= 2) {
749 struct branch *branch = branch_get(argv[0]);
750 int branch_existed = 0, remote_tracking = 0;
751 struct strbuf buf = STRBUF_INIT;
753 if (!strcmp(argv[0], "HEAD"))
754 die(_("it does not make sense to create 'HEAD' manually"));
756 if (!branch)
757 die(_("no such branch '%s'"), argv[0]);
759 if (filter.kind != FILTER_REFS_BRANCHES)
760 die(_("-a and -r options to 'git branch' do not make sense with a branch name"));
762 if (track == BRANCH_TRACK_OVERRIDE)
763 fprintf(stderr, _("The --set-upstream flag is deprecated and will be removed. Consider using --track or --set-upstream-to\n"));
765 strbuf_addf(&buf, "refs/remotes/%s", branch->name);
766 remote_tracking = ref_exists(buf.buf);
767 strbuf_release(&buf);
769 branch_existed = ref_exists(branch->refname);
770 create_branch(argv[0], (argc == 2) ? argv[1] : head,
771 force, reflog, 0, quiet, track);
774 * We only show the instructions if the user gave us
775 * one branch which doesn't exist locally, but is the
776 * name of a remote-tracking branch.
778 if (argc == 1 && track == BRANCH_TRACK_OVERRIDE &&
779 !branch_existed && remote_tracking) {
780 fprintf(stderr, _("\nIf you wanted to make '%s' track '%s', do this:\n\n"), head, branch->name);
781 fprintf(stderr, " git branch -d %s\n", branch->name);
782 fprintf(stderr, " git branch --set-upstream-to %s\n", branch->name);
785 } else
786 usage_with_options(builtin_branch_usage, options);
788 return 0;