]> git.ipfire.org Git - thirdparty/git.git/blob - builtin/branch.c
Merge branch 'vd/fsck-submodule-url-test'
[thirdparty/git.git] / builtin / branch.c
1 /*
2 * Builtin "git branch"
3 *
4 * Copyright (c) 2006 Kristian Høgsberg <krh@redhat.com>
5 * Based on git-branch.sh by Junio C Hamano.
6 */
7
8 #include "builtin.h"
9 #include "config.h"
10 #include "color.h"
11 #include "editor.h"
12 #include "environment.h"
13 #include "refs.h"
14 #include "commit.h"
15 #include "gettext.h"
16 #include "object-name.h"
17 #include "remote.h"
18 #include "parse-options.h"
19 #include "branch.h"
20 #include "path.h"
21 #include "string-list.h"
22 #include "column.h"
23 #include "utf8.h"
24 #include "ref-filter.h"
25 #include "worktree.h"
26 #include "help.h"
27 #include "advice.h"
28 #include "commit-reach.h"
29
30 static const char * const builtin_branch_usage[] = {
31 N_("git branch [<options>] [-r | -a] [--merged] [--no-merged]"),
32 N_("git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-point>]"),
33 N_("git branch [<options>] [-l] [<pattern>...]"),
34 N_("git branch [<options>] [-r] (-d | -D) <branch-name>..."),
35 N_("git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"),
36 N_("git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"),
37 N_("git branch [<options>] [-r | -a] [--points-at]"),
38 N_("git branch [<options>] [-r | -a] [--format]"),
39 NULL
40 };
41
42 static const char *head;
43 static struct object_id head_oid;
44 static int recurse_submodules = 0;
45 static int submodule_propagate_branches = 0;
46
47 static int branch_use_color = -1;
48 static char branch_colors[][COLOR_MAXLEN] = {
49 GIT_COLOR_RESET,
50 GIT_COLOR_NORMAL, /* PLAIN */
51 GIT_COLOR_RED, /* REMOTE */
52 GIT_COLOR_NORMAL, /* LOCAL */
53 GIT_COLOR_GREEN, /* CURRENT */
54 GIT_COLOR_BLUE, /* UPSTREAM */
55 GIT_COLOR_CYAN, /* WORKTREE */
56 };
57 enum color_branch {
58 BRANCH_COLOR_RESET = 0,
59 BRANCH_COLOR_PLAIN = 1,
60 BRANCH_COLOR_REMOTE = 2,
61 BRANCH_COLOR_LOCAL = 3,
62 BRANCH_COLOR_CURRENT = 4,
63 BRANCH_COLOR_UPSTREAM = 5,
64 BRANCH_COLOR_WORKTREE = 6
65 };
66
67 static const char *color_branch_slots[] = {
68 [BRANCH_COLOR_RESET] = "reset",
69 [BRANCH_COLOR_PLAIN] = "plain",
70 [BRANCH_COLOR_REMOTE] = "remote",
71 [BRANCH_COLOR_LOCAL] = "local",
72 [BRANCH_COLOR_CURRENT] = "current",
73 [BRANCH_COLOR_UPSTREAM] = "upstream",
74 [BRANCH_COLOR_WORKTREE] = "worktree",
75 };
76
77 static struct string_list output = STRING_LIST_INIT_DUP;
78 static unsigned int colopts;
79
80 define_list_config_array(color_branch_slots);
81
82 static int git_branch_config(const char *var, const char *value,
83 const struct config_context *ctx, void *cb)
84 {
85 const char *slot_name;
86
87 if (!strcmp(var, "branch.sort")) {
88 if (!value)
89 return config_error_nonbool(var);
90 string_list_append(cb, value);
91 return 0;
92 }
93
94 if (starts_with(var, "column."))
95 return git_column_config(var, value, "branch", &colopts);
96 if (!strcmp(var, "color.branch")) {
97 branch_use_color = git_config_colorbool(var, value);
98 return 0;
99 }
100 if (skip_prefix(var, "color.branch.", &slot_name)) {
101 int slot = LOOKUP_CONFIG(color_branch_slots, slot_name);
102 if (slot < 0)
103 return 0;
104 if (!value)
105 return config_error_nonbool(var);
106 return color_parse(value, branch_colors[slot]);
107 }
108 if (!strcmp(var, "submodule.recurse")) {
109 recurse_submodules = git_config_bool(var, value);
110 return 0;
111 }
112 if (!strcasecmp(var, "submodule.propagateBranches")) {
113 submodule_propagate_branches = git_config_bool(var, value);
114 return 0;
115 }
116
117 if (git_color_config(var, value, cb) < 0)
118 return -1;
119
120 return git_default_config(var, value, ctx, cb);
121 }
122
123 static const char *branch_get_color(enum color_branch ix)
124 {
125 if (want_color(branch_use_color))
126 return branch_colors[ix];
127 return "";
128 }
129
130 static int branch_merged(int kind, const char *name,
131 struct commit *rev, struct commit *head_rev)
132 {
133 /*
134 * This checks whether the merge bases of branch and HEAD (or
135 * the other branch this branch builds upon) contains the
136 * branch, which means that the branch has already been merged
137 * safely to HEAD (or the other branch).
138 */
139 struct commit *reference_rev = NULL;
140 const char *reference_name = NULL;
141 void *reference_name_to_free = NULL;
142 int merged;
143
144 if (kind == FILTER_REFS_BRANCHES) {
145 struct branch *branch = branch_get(name);
146 const char *upstream = branch_get_upstream(branch, NULL);
147 struct object_id oid;
148
149 if (upstream &&
150 (reference_name = reference_name_to_free =
151 resolve_refdup(upstream, RESOLVE_REF_READING,
152 &oid, NULL)) != NULL)
153 reference_rev = lookup_commit_reference(the_repository,
154 &oid);
155 }
156 if (!reference_rev)
157 reference_rev = head_rev;
158
159 merged = reference_rev ? repo_in_merge_bases(the_repository, rev,
160 reference_rev) : 0;
161
162 /*
163 * After the safety valve is fully redefined to "check with
164 * upstream, if any, otherwise with HEAD", we should just
165 * return the result of the repo_in_merge_bases() above without
166 * any of the following code, but during the transition period,
167 * a gentle reminder is in order.
168 */
169 if ((head_rev != reference_rev) &&
170 (head_rev ? repo_in_merge_bases(the_repository, rev, head_rev) : 0) != merged) {
171 if (merged)
172 warning(_("deleting branch '%s' that has been merged to\n"
173 " '%s', but not yet merged to HEAD"),
174 name, reference_name);
175 else
176 warning(_("not deleting branch '%s' that is not yet merged to\n"
177 " '%s', even though it is merged to HEAD"),
178 name, reference_name);
179 }
180 free(reference_name_to_free);
181 return merged;
182 }
183
184 static int check_branch_commit(const char *branchname, const char *refname,
185 const struct object_id *oid, struct commit *head_rev,
186 int kinds, int force)
187 {
188 struct commit *rev = lookup_commit_reference(the_repository, oid);
189 if (!force && !rev) {
190 error(_("couldn't look up commit object for '%s'"), refname);
191 return -1;
192 }
193 if (!force && !branch_merged(kinds, branchname, rev, head_rev)) {
194 error(_("the branch '%s' is not fully merged"), branchname);
195 advise_if_enabled(ADVICE_FORCE_DELETE_BRANCH,
196 _("If you are sure you want to delete it, "
197 "run 'git branch -D %s'"), branchname);
198 return -1;
199 }
200 return 0;
201 }
202
203 static void delete_branch_config(const char *branchname)
204 {
205 struct strbuf buf = STRBUF_INIT;
206 strbuf_addf(&buf, "branch.%s", branchname);
207 if (git_config_rename_section(buf.buf, NULL) < 0)
208 warning(_("update of config-file failed"));
209 strbuf_release(&buf);
210 }
211
212 static int delete_branches(int argc, const char **argv, int force, int kinds,
213 int quiet)
214 {
215 struct commit *head_rev = NULL;
216 struct object_id oid;
217 char *name = NULL;
218 const char *fmt;
219 int i;
220 int ret = 0;
221 int remote_branch = 0;
222 struct strbuf bname = STRBUF_INIT;
223 unsigned allowed_interpret;
224 struct string_list refs_to_delete = STRING_LIST_INIT_DUP;
225 struct string_list_item *item;
226 int branch_name_pos;
227 const char *fmt_remotes = "refs/remotes/%s";
228
229 switch (kinds) {
230 case FILTER_REFS_REMOTES:
231 fmt = fmt_remotes;
232 /* For subsequent UI messages */
233 remote_branch = 1;
234 allowed_interpret = INTERPRET_BRANCH_REMOTE;
235
236 force = 1;
237 break;
238 case FILTER_REFS_BRANCHES:
239 fmt = "refs/heads/%s";
240 allowed_interpret = INTERPRET_BRANCH_LOCAL;
241 break;
242 default:
243 die(_("cannot use -a with -d"));
244 }
245 branch_name_pos = strcspn(fmt, "%");
246
247 if (!force)
248 head_rev = lookup_commit_reference(the_repository, &head_oid);
249
250 for (i = 0; i < argc; i++, strbuf_reset(&bname)) {
251 char *target = NULL;
252 int flags = 0;
253
254 strbuf_branchname(&bname, argv[i], allowed_interpret);
255 free(name);
256 name = mkpathdup(fmt, bname.buf);
257
258 if (kinds == FILTER_REFS_BRANCHES) {
259 const char *path;
260 if ((path = branch_checked_out(name))) {
261 error(_("cannot delete branch '%s' "
262 "used by worktree at '%s'"),
263 bname.buf, path);
264 ret = 1;
265 continue;
266 }
267 }
268
269 target = resolve_refdup(name,
270 RESOLVE_REF_READING
271 | RESOLVE_REF_NO_RECURSE
272 | RESOLVE_REF_ALLOW_BAD_NAME,
273 &oid, &flags);
274 if (!target) {
275 if (remote_branch) {
276 error(_("remote-tracking branch '%s' not found"), bname.buf);
277 } else {
278 char *virtual_name = mkpathdup(fmt_remotes, bname.buf);
279 char *virtual_target = resolve_refdup(virtual_name,
280 RESOLVE_REF_READING
281 | RESOLVE_REF_NO_RECURSE
282 | RESOLVE_REF_ALLOW_BAD_NAME,
283 &oid, &flags);
284 FREE_AND_NULL(virtual_name);
285
286 if (virtual_target)
287 error(_("branch '%s' not found.\n"
288 "Did you forget --remote?"),
289 bname.buf);
290 else
291 error(_("branch '%s' not found"), bname.buf);
292 FREE_AND_NULL(virtual_target);
293 }
294 ret = 1;
295 continue;
296 }
297
298 if (!(flags & (REF_ISSYMREF|REF_ISBROKEN)) &&
299 check_branch_commit(bname.buf, name, &oid, head_rev, kinds,
300 force)) {
301 ret = 1;
302 goto next;
303 }
304
305 item = string_list_append(&refs_to_delete, name);
306 item->util = xstrdup((flags & REF_ISBROKEN) ? "broken"
307 : (flags & REF_ISSYMREF) ? target
308 : repo_find_unique_abbrev(the_repository, &oid, DEFAULT_ABBREV));
309
310 next:
311 free(target);
312 }
313
314 if (delete_refs(NULL, &refs_to_delete, REF_NO_DEREF))
315 ret = 1;
316
317 for_each_string_list_item(item, &refs_to_delete) {
318 char *describe_ref = item->util;
319 char *name = item->string;
320 if (!ref_exists(name)) {
321 char *refname = name + branch_name_pos;
322 if (!quiet)
323 printf(remote_branch
324 ? _("Deleted remote-tracking branch %s (was %s).\n")
325 : _("Deleted branch %s (was %s).\n"),
326 name + branch_name_pos, describe_ref);
327
328 delete_branch_config(refname);
329 }
330 free(describe_ref);
331 }
332 string_list_clear(&refs_to_delete, 0);
333
334 free(name);
335 strbuf_release(&bname);
336
337 return ret;
338 }
339
340 static int calc_maxwidth(struct ref_array *refs, int remote_bonus)
341 {
342 int i, max = 0;
343 for (i = 0; i < refs->nr; i++) {
344 struct ref_array_item *it = refs->items[i];
345 const char *desc = it->refname;
346 int w;
347
348 skip_prefix(it->refname, "refs/heads/", &desc);
349 skip_prefix(it->refname, "refs/remotes/", &desc);
350 if (it->kind == FILTER_REFS_DETACHED_HEAD) {
351 char *head_desc = get_head_description();
352 w = utf8_strwidth(head_desc);
353 free(head_desc);
354 } else
355 w = utf8_strwidth(desc);
356
357 if (it->kind == FILTER_REFS_REMOTES)
358 w += remote_bonus;
359 if (w > max)
360 max = w;
361 }
362 return max;
363 }
364
365 static const char *quote_literal_for_format(const char *s)
366 {
367 static struct strbuf buf = STRBUF_INIT;
368
369 strbuf_reset(&buf);
370 while (strbuf_expand_step(&buf, &s))
371 strbuf_addstr(&buf, "%%");
372 return buf.buf;
373 }
374
375 static char *build_format(struct ref_filter *filter, int maxwidth, const char *remote_prefix)
376 {
377 struct strbuf fmt = STRBUF_INIT;
378 struct strbuf local = STRBUF_INIT;
379 struct strbuf remote = STRBUF_INIT;
380
381 strbuf_addf(&local, "%%(if)%%(HEAD)%%(then)* %s%%(else)%%(if)%%(worktreepath)%%(then)+ %s%%(else) %s%%(end)%%(end)",
382 branch_get_color(BRANCH_COLOR_CURRENT),
383 branch_get_color(BRANCH_COLOR_WORKTREE),
384 branch_get_color(BRANCH_COLOR_LOCAL));
385 strbuf_addf(&remote, " %s",
386 branch_get_color(BRANCH_COLOR_REMOTE));
387
388 if (filter->verbose) {
389 struct strbuf obname = STRBUF_INIT;
390
391 if (filter->abbrev < 0)
392 strbuf_addf(&obname, "%%(objectname:short)");
393 else if (!filter->abbrev)
394 strbuf_addf(&obname, "%%(objectname)");
395 else
396 strbuf_addf(&obname, "%%(objectname:short=%d)", filter->abbrev);
397
398 strbuf_addf(&local, "%%(align:%d,left)%%(refname:lstrip=2)%%(end)", maxwidth);
399 strbuf_addstr(&local, branch_get_color(BRANCH_COLOR_RESET));
400 strbuf_addf(&local, " %s ", obname.buf);
401
402 if (filter->verbose > 1)
403 {
404 strbuf_addf(&local, "%%(if:notequals=*)%%(HEAD)%%(then)%%(if)%%(worktreepath)%%(then)(%s%%(worktreepath)%s) %%(end)%%(end)",
405 branch_get_color(BRANCH_COLOR_WORKTREE), branch_get_color(BRANCH_COLOR_RESET));
406 strbuf_addf(&local, "%%(if)%%(upstream)%%(then)[%s%%(upstream:short)%s%%(if)%%(upstream:track)"
407 "%%(then): %%(upstream:track,nobracket)%%(end)] %%(end)%%(contents:subject)",
408 branch_get_color(BRANCH_COLOR_UPSTREAM), branch_get_color(BRANCH_COLOR_RESET));
409 }
410 else
411 strbuf_addf(&local, "%%(if)%%(upstream:track)%%(then)%%(upstream:track) %%(end)%%(contents:subject)");
412
413 strbuf_addf(&remote, "%%(align:%d,left)%s%%(refname:lstrip=2)%%(end)%s"
414 "%%(if)%%(symref)%%(then) -> %%(symref:short)"
415 "%%(else) %s %%(contents:subject)%%(end)",
416 maxwidth, quote_literal_for_format(remote_prefix),
417 branch_get_color(BRANCH_COLOR_RESET), obname.buf);
418 strbuf_release(&obname);
419 } else {
420 strbuf_addf(&local, "%%(refname:lstrip=2)%s%%(if)%%(symref)%%(then) -> %%(symref:short)%%(end)",
421 branch_get_color(BRANCH_COLOR_RESET));
422 strbuf_addf(&remote, "%s%%(refname:lstrip=2)%s%%(if)%%(symref)%%(then) -> %%(symref:short)%%(end)",
423 quote_literal_for_format(remote_prefix),
424 branch_get_color(BRANCH_COLOR_RESET));
425 }
426
427 strbuf_addf(&fmt, "%%(if:notequals=refs/remotes)%%(refname:rstrip=-2)%%(then)%s%%(else)%s%%(end)", local.buf, remote.buf);
428
429 strbuf_release(&local);
430 strbuf_release(&remote);
431 return strbuf_detach(&fmt, NULL);
432 }
433
434 static void print_ref_list(struct ref_filter *filter, struct ref_sorting *sorting,
435 struct ref_format *format, struct string_list *output)
436 {
437 int i;
438 struct ref_array array;
439 int maxwidth = 0;
440 const char *remote_prefix = "";
441 char *to_free = NULL;
442
443 /*
444 * If we are listing more than just remote branches,
445 * then remote branches will have a "remotes/" prefix.
446 * We need to account for this in the width.
447 */
448 if (filter->kind != FILTER_REFS_REMOTES)
449 remote_prefix = "remotes/";
450
451 memset(&array, 0, sizeof(array));
452
453 filter_refs(&array, filter, filter->kind);
454
455 if (filter->verbose)
456 maxwidth = calc_maxwidth(&array, strlen(remote_prefix));
457
458 if (!format->format)
459 format->format = to_free = build_format(filter, maxwidth, remote_prefix);
460 format->use_color = branch_use_color;
461
462 if (verify_ref_format(format))
463 die(_("unable to parse format string"));
464
465 filter_ahead_behind(the_repository, format, &array);
466 ref_array_sort(sorting, &array);
467
468 if (column_active(colopts)) {
469 struct strbuf out = STRBUF_INIT, err = STRBUF_INIT;
470
471 assert(!filter->verbose && "--column and --verbose are incompatible");
472
473 for (i = 0; i < array.nr; i++) {
474 strbuf_reset(&err);
475 strbuf_reset(&out);
476 if (format_ref_array_item(array.items[i], format, &out, &err))
477 die("%s", err.buf);
478
479 /* format to a string_list to let print_columns() do its job */
480 string_list_append(output, out.buf);
481 }
482
483 strbuf_release(&err);
484 strbuf_release(&out);
485 } else {
486 print_formatted_ref_array(&array, format);
487 }
488
489 ref_array_clear(&array);
490 free(to_free);
491 }
492
493 static void print_current_branch_name(void)
494 {
495 int flags;
496 const char *refname = resolve_ref_unsafe("HEAD", 0, NULL, &flags);
497 const char *shortname;
498 if (!refname)
499 die(_("could not resolve HEAD"));
500 else if (!(flags & REF_ISSYMREF))
501 return;
502 else if (skip_prefix(refname, "refs/heads/", &shortname))
503 puts(shortname);
504 else
505 die(_("HEAD (%s) points outside of refs/heads/"), refname);
506 }
507
508 static void reject_rebase_or_bisect_branch(struct worktree **worktrees,
509 const char *target)
510 {
511 int i;
512
513 for (i = 0; worktrees[i]; i++) {
514 struct worktree *wt = worktrees[i];
515
516 if (!wt->is_detached)
517 continue;
518
519 if (is_worktree_being_rebased(wt, target))
520 die(_("branch %s is being rebased at %s"),
521 target, wt->path);
522
523 if (is_worktree_being_bisected(wt, target))
524 die(_("branch %s is being bisected at %s"),
525 target, wt->path);
526 }
527 }
528
529 /*
530 * Update all per-worktree HEADs pointing at the old ref to point the new ref.
531 * This will be used when renaming a branch. Returns 0 if successful, non-zero
532 * otherwise.
533 */
534 static int replace_each_worktree_head_symref(struct worktree **worktrees,
535 const char *oldref, const char *newref,
536 const char *logmsg)
537 {
538 int ret = 0;
539 int i;
540
541 for (i = 0; worktrees[i]; i++) {
542 struct ref_store *refs;
543
544 if (worktrees[i]->is_detached)
545 continue;
546 if (!worktrees[i]->head_ref)
547 continue;
548 if (strcmp(oldref, worktrees[i]->head_ref))
549 continue;
550
551 refs = get_worktree_ref_store(worktrees[i]);
552 if (refs_create_symref(refs, "HEAD", newref, logmsg))
553 ret = error(_("HEAD of working tree %s is not updated"),
554 worktrees[i]->path);
555 }
556
557 return ret;
558 }
559
560 #define IS_HEAD 1
561 #define IS_ORPHAN 2
562
563 static void copy_or_rename_branch(const char *oldname, const char *newname, int copy, int force)
564 {
565 struct strbuf oldref = STRBUF_INIT, newref = STRBUF_INIT, logmsg = STRBUF_INIT;
566 struct strbuf oldsection = STRBUF_INIT, newsection = STRBUF_INIT;
567 const char *interpreted_oldname = NULL;
568 const char *interpreted_newname = NULL;
569 int recovery = 0, oldref_usage = 0;
570 struct worktree **worktrees = get_worktrees();
571
572 if (strbuf_check_branch_ref(&oldref, oldname)) {
573 /*
574 * Bad name --- this could be an attempt to rename a
575 * ref that we used to allow to be created by accident.
576 */
577 if (ref_exists(oldref.buf))
578 recovery = 1;
579 else
580 die(_("invalid branch name: '%s'"), oldname);
581 }
582
583 for (int i = 0; worktrees[i]; i++) {
584 struct worktree *wt = worktrees[i];
585
586 if (wt->head_ref && !strcmp(oldref.buf, wt->head_ref)) {
587 oldref_usage |= IS_HEAD;
588 if (is_null_oid(&wt->head_oid))
589 oldref_usage |= IS_ORPHAN;
590 break;
591 }
592 }
593
594 if ((copy || !(oldref_usage & IS_HEAD)) && !ref_exists(oldref.buf)) {
595 if (oldref_usage & IS_HEAD)
596 die(_("no commit on branch '%s' yet"), oldname);
597 else
598 die(_("no branch named '%s'"), oldname);
599 }
600
601 /*
602 * A command like "git branch -M currentbranch currentbranch" cannot
603 * cause the worktree to become inconsistent with HEAD, so allow it.
604 */
605 if (!strcmp(oldname, newname))
606 validate_branchname(newname, &newref);
607 else
608 validate_new_branchname(newname, &newref, force);
609
610 reject_rebase_or_bisect_branch(worktrees, oldref.buf);
611
612 if (!skip_prefix(oldref.buf, "refs/heads/", &interpreted_oldname) ||
613 !skip_prefix(newref.buf, "refs/heads/", &interpreted_newname)) {
614 BUG("expected prefix missing for refs");
615 }
616
617 if (copy)
618 strbuf_addf(&logmsg, "Branch: copied %s to %s",
619 oldref.buf, newref.buf);
620 else
621 strbuf_addf(&logmsg, "Branch: renamed %s to %s",
622 oldref.buf, newref.buf);
623
624 if (!copy && !(oldref_usage & IS_ORPHAN) &&
625 rename_ref(oldref.buf, newref.buf, logmsg.buf))
626 die(_("branch rename failed"));
627 if (copy && copy_existing_ref(oldref.buf, newref.buf, logmsg.buf))
628 die(_("branch copy failed"));
629
630 if (recovery) {
631 if (copy)
632 warning(_("created a copy of a misnamed branch '%s'"),
633 interpreted_oldname);
634 else
635 warning(_("renamed a misnamed branch '%s' away"),
636 interpreted_oldname);
637 }
638
639 if (!copy && (oldref_usage & IS_HEAD) &&
640 replace_each_worktree_head_symref(worktrees, oldref.buf, newref.buf,
641 logmsg.buf))
642 die(_("branch renamed to %s, but HEAD is not updated"), newname);
643
644 strbuf_release(&logmsg);
645
646 strbuf_addf(&oldsection, "branch.%s", interpreted_oldname);
647 strbuf_addf(&newsection, "branch.%s", interpreted_newname);
648 if (!copy && git_config_rename_section(oldsection.buf, newsection.buf) < 0)
649 die(_("branch is renamed, but update of config-file failed"));
650 if (copy && strcmp(interpreted_oldname, interpreted_newname) && git_config_copy_section(oldsection.buf, newsection.buf) < 0)
651 die(_("branch is copied, but update of config-file failed"));
652 strbuf_release(&oldref);
653 strbuf_release(&newref);
654 strbuf_release(&oldsection);
655 strbuf_release(&newsection);
656 free_worktrees(worktrees);
657 }
658
659 static GIT_PATH_FUNC(edit_description, "EDIT_DESCRIPTION")
660
661 static int edit_branch_description(const char *branch_name)
662 {
663 int exists;
664 struct strbuf buf = STRBUF_INIT;
665 struct strbuf name = STRBUF_INIT;
666
667 exists = !read_branch_desc(&buf, branch_name);
668 if (!buf.len || buf.buf[buf.len-1] != '\n')
669 strbuf_addch(&buf, '\n');
670 strbuf_commented_addf(&buf, comment_line_char,
671 _("Please edit the description for the branch\n"
672 " %s\n"
673 "Lines starting with '%c' will be stripped.\n"),
674 branch_name, comment_line_char);
675 write_file_buf(edit_description(), buf.buf, buf.len);
676 strbuf_reset(&buf);
677 if (launch_editor(edit_description(), &buf, NULL)) {
678 strbuf_release(&buf);
679 return -1;
680 }
681 strbuf_stripspace(&buf, comment_line_char);
682
683 strbuf_addf(&name, "branch.%s.description", branch_name);
684 if (buf.len || exists)
685 git_config_set(name.buf, buf.len ? buf.buf : NULL);
686 strbuf_release(&name);
687 strbuf_release(&buf);
688
689 return 0;
690 }
691
692 int cmd_branch(int argc, const char **argv, const char *prefix)
693 {
694 /* possible actions */
695 int delete = 0, rename = 0, copy = 0, list = 0,
696 unset_upstream = 0, show_current = 0, edit_description = 0;
697 const char *new_upstream = NULL;
698 int noncreate_actions = 0;
699 /* possible options */
700 int reflog = 0, quiet = 0, icase = 0, force = 0,
701 recurse_submodules_explicit = 0;
702 enum branch_track track;
703 struct ref_filter filter = REF_FILTER_INIT;
704 static struct ref_sorting *sorting;
705 struct string_list sorting_options = STRING_LIST_INIT_DUP;
706 struct ref_format format = REF_FORMAT_INIT;
707
708 struct option options[] = {
709 OPT_GROUP(N_("Generic options")),
710 OPT__VERBOSE(&filter.verbose,
711 N_("show hash and subject, give twice for upstream branch")),
712 OPT__QUIET(&quiet, N_("suppress informational messages")),
713 OPT_CALLBACK_F('t', "track", &track, "(direct|inherit)",
714 N_("set branch tracking configuration"),
715 PARSE_OPT_OPTARG,
716 parse_opt_tracking_mode),
717 OPT_SET_INT_F(0, "set-upstream", &track, N_("do not use"),
718 BRANCH_TRACK_OVERRIDE, PARSE_OPT_HIDDEN),
719 OPT_STRING('u', "set-upstream-to", &new_upstream, N_("upstream"), N_("change the upstream info")),
720 OPT_BOOL(0, "unset-upstream", &unset_upstream, N_("unset the upstream info")),
721 OPT__COLOR(&branch_use_color, N_("use colored output")),
722 OPT_SET_INT_F('r', "remotes", &filter.kind, N_("act on remote-tracking branches"),
723 FILTER_REFS_REMOTES,
724 PARSE_OPT_NONEG),
725 OPT_CONTAINS(&filter.with_commit, N_("print only branches that contain the commit")),
726 OPT_NO_CONTAINS(&filter.no_commit, N_("print only branches that don't contain the commit")),
727 OPT_WITH(&filter.with_commit, N_("print only branches that contain the commit")),
728 OPT_WITHOUT(&filter.no_commit, N_("print only branches that don't contain the commit")),
729 OPT__ABBREV(&filter.abbrev),
730
731 OPT_GROUP(N_("Specific git-branch actions:")),
732 OPT_SET_INT_F('a', "all", &filter.kind, N_("list both remote-tracking and local branches"),
733 FILTER_REFS_REMOTES | FILTER_REFS_BRANCHES,
734 PARSE_OPT_NONEG),
735 OPT_BIT('d', "delete", &delete, N_("delete fully merged branch"), 1),
736 OPT_BIT('D', NULL, &delete, N_("delete branch (even if not merged)"), 2),
737 OPT_BIT('m', "move", &rename, N_("move/rename a branch and its reflog"), 1),
738 OPT_BIT('M', NULL, &rename, N_("move/rename a branch, even if target exists"), 2),
739 OPT_BOOL(0, "omit-empty", &format.array_opts.omit_empty,
740 N_("do not output a newline after empty formatted refs")),
741 OPT_BIT('c', "copy", &copy, N_("copy a branch and its reflog"), 1),
742 OPT_BIT('C', NULL, &copy, N_("copy a branch, even if target exists"), 2),
743 OPT_BOOL('l', "list", &list, N_("list branch names")),
744 OPT_BOOL(0, "show-current", &show_current, N_("show current branch name")),
745 OPT_BOOL(0, "create-reflog", &reflog, N_("create the branch's reflog")),
746 OPT_BOOL(0, "edit-description", &edit_description,
747 N_("edit the description for the branch")),
748 OPT__FORCE(&force, N_("force creation, move/rename, deletion"), PARSE_OPT_NOCOMPLETE),
749 OPT_MERGED(&filter, N_("print only branches that are merged")),
750 OPT_NO_MERGED(&filter, N_("print only branches that are not merged")),
751 OPT_COLUMN(0, "column", &colopts, N_("list branches in columns")),
752 OPT_REF_SORT(&sorting_options),
753 OPT_CALLBACK(0, "points-at", &filter.points_at, N_("object"),
754 N_("print only branches of the object"), parse_opt_object_name),
755 OPT_BOOL('i', "ignore-case", &icase, N_("sorting and filtering are case insensitive")),
756 OPT_BOOL(0, "recurse-submodules", &recurse_submodules_explicit, N_("recurse through submodules")),
757 OPT_STRING( 0 , "format", &format.format, N_("format"), N_("format to use for the output")),
758 OPT_END(),
759 };
760
761 setup_ref_filter_porcelain_msg();
762
763 filter.kind = FILTER_REFS_BRANCHES;
764 filter.abbrev = -1;
765
766 if (argc == 2 && !strcmp(argv[1], "-h"))
767 usage_with_options(builtin_branch_usage, options);
768
769 /*
770 * Try to set sort keys from config. If config does not set any,
771 * fall back on default (refname) sorting.
772 */
773 git_config(git_branch_config, &sorting_options);
774 if (!sorting_options.nr)
775 string_list_append(&sorting_options, "refname");
776
777 track = git_branch_track;
778
779 head = resolve_refdup("HEAD", 0, &head_oid, NULL);
780 if (!head)
781 die(_("failed to resolve HEAD as a valid ref"));
782 if (!strcmp(head, "HEAD"))
783 filter.detached = 1;
784 else if (!skip_prefix(head, "refs/heads/", &head))
785 die(_("HEAD not found below refs/heads!"));
786
787 argc = parse_options(argc, argv, prefix, options, builtin_branch_usage,
788 0);
789
790 if (!delete && !rename && !copy && !edit_description && !new_upstream &&
791 !show_current && !unset_upstream && argc == 0)
792 list = 1;
793
794 if (filter.with_commit || filter.no_commit ||
795 filter.reachable_from || filter.unreachable_from || filter.points_at.nr)
796 list = 1;
797
798 noncreate_actions = !!delete + !!rename + !!copy + !!new_upstream +
799 !!show_current + !!list + !!edit_description +
800 !!unset_upstream;
801 if (noncreate_actions > 1)
802 usage_with_options(builtin_branch_usage, options);
803
804 if (recurse_submodules_explicit) {
805 if (!submodule_propagate_branches)
806 die(_("branch with --recurse-submodules can only be used if submodule.propagateBranches is enabled"));
807 if (noncreate_actions)
808 die(_("--recurse-submodules can only be used to create branches"));
809 }
810
811 recurse_submodules =
812 (recurse_submodules || recurse_submodules_explicit) &&
813 submodule_propagate_branches;
814
815 if (filter.abbrev == -1)
816 filter.abbrev = DEFAULT_ABBREV;
817 filter.ignore_case = icase;
818
819 finalize_colopts(&colopts, -1);
820 if (filter.verbose) {
821 if (explicitly_enable_column(colopts))
822 die(_("options '%s' and '%s' cannot be used together"), "--column", "--verbose");
823 colopts = 0;
824 }
825
826 if (force) {
827 delete *= 2;
828 rename *= 2;
829 copy *= 2;
830 }
831
832 if (list)
833 setup_auto_pager("branch", 1);
834
835 UNLEAK(sorting_options);
836
837 if (delete) {
838 if (!argc)
839 die(_("branch name required"));
840 return delete_branches(argc, argv, delete > 1, filter.kind, quiet);
841 } else if (show_current) {
842 print_current_branch_name();
843 return 0;
844 } else if (list) {
845 /* git branch --list also shows HEAD when it is detached */
846 if ((filter.kind & FILTER_REFS_BRANCHES) && filter.detached)
847 filter.kind |= FILTER_REFS_DETACHED_HEAD;
848 filter.name_patterns = argv;
849 /*
850 * If no sorting parameter is given then we default to sorting
851 * by 'refname'. This would give us an alphabetically sorted
852 * array with the 'HEAD' ref at the beginning followed by
853 * local branches 'refs/heads/...' and finally remote-tracking
854 * branches 'refs/remotes/...'.
855 */
856 sorting = ref_sorting_options(&sorting_options);
857 ref_sorting_set_sort_flags_all(sorting, REF_SORTING_ICASE, icase);
858 ref_sorting_set_sort_flags_all(
859 sorting, REF_SORTING_DETACHED_HEAD_FIRST, 1);
860 print_ref_list(&filter, sorting, &format, &output);
861 print_columns(&output, colopts, NULL);
862 string_list_clear(&output, 0);
863 ref_sorting_release(sorting);
864 ref_filter_clear(&filter);
865 return 0;
866 } else if (edit_description) {
867 const char *branch_name;
868 struct strbuf branch_ref = STRBUF_INIT;
869 struct strbuf buf = STRBUF_INIT;
870 int ret = 1; /* assume failure */
871
872 if (!argc) {
873 if (filter.detached)
874 die(_("cannot give description to detached HEAD"));
875 branch_name = head;
876 } else if (argc == 1) {
877 strbuf_branchname(&buf, argv[0], INTERPRET_BRANCH_LOCAL);
878 branch_name = buf.buf;
879 } else {
880 die(_("cannot edit description of more than one branch"));
881 }
882
883 strbuf_addf(&branch_ref, "refs/heads/%s", branch_name);
884 if (!ref_exists(branch_ref.buf))
885 error((!argc || branch_checked_out(branch_ref.buf))
886 ? _("no commit on branch '%s' yet")
887 : _("no branch named '%s'"),
888 branch_name);
889 else if (!edit_branch_description(branch_name))
890 ret = 0; /* happy */
891
892 strbuf_release(&branch_ref);
893 strbuf_release(&buf);
894
895 return ret;
896 } else if (copy || rename) {
897 if (!argc)
898 die(_("branch name required"));
899 else if ((argc == 1) && filter.detached)
900 die(copy? _("cannot copy the current branch while not on any")
901 : _("cannot rename the current branch while not on any"));
902 else if (argc == 1)
903 copy_or_rename_branch(head, argv[0], copy, copy + rename > 1);
904 else if (argc == 2)
905 copy_or_rename_branch(argv[0], argv[1], copy, copy + rename > 1);
906 else
907 die(copy? _("too many branches for a copy operation")
908 : _("too many arguments for a rename operation"));
909 } else if (new_upstream) {
910 struct branch *branch;
911 struct strbuf buf = STRBUF_INIT;
912
913 if (!argc)
914 branch = branch_get(NULL);
915 else if (argc == 1) {
916 strbuf_branchname(&buf, argv[0], INTERPRET_BRANCH_LOCAL);
917 branch = branch_get(buf.buf);
918 } else
919 die(_("too many arguments to set new upstream"));
920
921 if (!branch) {
922 if (!argc || !strcmp(argv[0], "HEAD"))
923 die(_("could not set upstream of HEAD to %s when "
924 "it does not point to any branch"),
925 new_upstream);
926 die(_("no such branch '%s'"), argv[0]);
927 }
928
929 if (!ref_exists(branch->refname)) {
930 if (!argc || branch_checked_out(branch->refname))
931 die(_("no commit on branch '%s' yet"), branch->name);
932 die(_("branch '%s' does not exist"), branch->name);
933 }
934
935 dwim_and_setup_tracking(the_repository, branch->name,
936 new_upstream, BRANCH_TRACK_OVERRIDE,
937 quiet);
938 strbuf_release(&buf);
939 } else if (unset_upstream) {
940 struct branch *branch;
941 struct strbuf buf = STRBUF_INIT;
942
943 if (!argc)
944 branch = branch_get(NULL);
945 else if (argc == 1) {
946 strbuf_branchname(&buf, argv[0], INTERPRET_BRANCH_LOCAL);
947 branch = branch_get(buf.buf);
948 } else
949 die(_("too many arguments to unset upstream"));
950
951 if (!branch) {
952 if (!argc || !strcmp(argv[0], "HEAD"))
953 die(_("could not unset upstream of HEAD when "
954 "it does not point to any branch"));
955 die(_("no such branch '%s'"), argv[0]);
956 }
957
958 if (!branch_has_merge_config(branch))
959 die(_("branch '%s' has no upstream information"), branch->name);
960
961 strbuf_reset(&buf);
962 strbuf_addf(&buf, "branch.%s.remote", branch->name);
963 git_config_set_multivar(buf.buf, NULL, NULL, CONFIG_FLAGS_MULTI_REPLACE);
964 strbuf_reset(&buf);
965 strbuf_addf(&buf, "branch.%s.merge", branch->name);
966 git_config_set_multivar(buf.buf, NULL, NULL, CONFIG_FLAGS_MULTI_REPLACE);
967 strbuf_release(&buf);
968 } else if (!noncreate_actions && argc > 0 && argc <= 2) {
969 const char *branch_name = argv[0];
970 const char *start_name = argc == 2 ? argv[1] : head;
971
972 if (filter.kind != FILTER_REFS_BRANCHES)
973 die(_("the -a, and -r, options to 'git branch' do not take a branch name.\n"
974 "Did you mean to use: -a|-r --list <pattern>?"));
975
976 if (track == BRANCH_TRACK_OVERRIDE)
977 die(_("the '--set-upstream' option is no longer supported. Please use '--track' or '--set-upstream-to' instead"));
978
979 if (recurse_submodules) {
980 create_branches_recursively(the_repository, branch_name,
981 start_name, NULL, force,
982 reflog, quiet, track, 0);
983 return 0;
984 }
985 create_branch(the_repository, branch_name, start_name, force, 0,
986 reflog, quiet, track, 0);
987 } else
988 usage_with_options(builtin_branch_usage, options);
989
990 return 0;
991 }