]>
Commit | Line | Data |
---|---|---|
c31820c2 LH |
1 | /* |
2 | * Builtin "git branch" | |
3 | * | |
d972cce0 | 4 | * Copyright (c) 2006 Kristian Høgsberg <krh@redhat.com> |
c31820c2 LH |
5 | * Based on git-branch.sh by Junio C Hamano. |
6 | */ | |
7 | ||
8 | #include "cache.h" | |
b2141fc1 | 9 | #include "config.h" |
85023577 | 10 | #include "color.h" |
c31820c2 LH |
11 | #include "refs.h" |
12 | #include "commit.h" | |
13 | #include "builtin.h" | |
6f084a56 | 14 | #include "remote.h" |
a8dfd5ea | 15 | #include "parse-options.h" |
e496c003 | 16 | #include "branch.h" |
68067ca1 JH |
17 | #include "diff.h" |
18 | #include "revision.h" | |
ebe31ef2 NTND |
19 | #include "string-list.h" |
20 | #include "column.h" | |
1452bd64 | 21 | #include "utf8.h" |
c8183cd2 | 22 | #include "wt-status.h" |
1511b22d | 23 | #include "ref-filter.h" |
f292244c | 24 | #include "worktree.h" |
a8dfd5ea PH |
25 | |
26 | static const char * const builtin_branch_usage[] = { | |
9c9b4f2f AH |
27 | N_("git branch [<options>] [-r | -a] [--merged | --no-merged]"), |
28 | N_("git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"), | |
29 | N_("git branch [<options>] [-r] (-d | -D) <branch-name>..."), | |
30 | N_("git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"), | |
52d59cc6 | 31 | N_("git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"), |
aa3bc55e | 32 | N_("git branch [<options>] [-r | -a] [--points-at]"), |
3d9e4ce3 | 33 | N_("git branch [<options>] [-r | -a] [--format]"), |
a8dfd5ea PH |
34 | NULL |
35 | }; | |
c31820c2 | 36 | |
c31820c2 | 37 | static const char *head; |
0c77cd24 | 38 | static struct object_id head_oid; |
c31820c2 | 39 | |
6b2f2d98 | 40 | static int branch_use_color = -1; |
a1158cae | 41 | static char branch_colors[][COLOR_MAXLEN] = { |
dc6ebd4c | 42 | GIT_COLOR_RESET, |
949af068 KN |
43 | GIT_COLOR_NORMAL, /* PLAIN */ |
44 | GIT_COLOR_RED, /* REMOTE */ | |
45 | GIT_COLOR_NORMAL, /* LOCAL */ | |
46 | GIT_COLOR_GREEN, /* CURRENT */ | |
47 | GIT_COLOR_BLUE, /* UPSTREAM */ | |
a1158cae AP |
48 | }; |
49 | enum color_branch { | |
74bb2dfb AL |
50 | BRANCH_COLOR_RESET = 0, |
51 | BRANCH_COLOR_PLAIN = 1, | |
52 | BRANCH_COLOR_REMOTE = 2, | |
53 | BRANCH_COLOR_LOCAL = 3, | |
dbda21fa FC |
54 | BRANCH_COLOR_CURRENT = 4, |
55 | BRANCH_COLOR_UPSTREAM = 5 | |
a1158cae AP |
56 | }; |
57 | ||
ebe31ef2 NTND |
58 | static struct string_list output = STRING_LIST_INIT_DUP; |
59 | static unsigned int colopts; | |
60 | ||
8852117a | 61 | static int parse_branch_color_slot(const char *slot) |
a1158cae | 62 | { |
8852117a | 63 | if (!strcasecmp(slot, "plain")) |
74bb2dfb | 64 | return BRANCH_COLOR_PLAIN; |
8852117a | 65 | if (!strcasecmp(slot, "reset")) |
74bb2dfb | 66 | return BRANCH_COLOR_RESET; |
8852117a | 67 | if (!strcasecmp(slot, "remote")) |
74bb2dfb | 68 | return BRANCH_COLOR_REMOTE; |
8852117a | 69 | if (!strcasecmp(slot, "local")) |
74bb2dfb | 70 | return BRANCH_COLOR_LOCAL; |
8852117a | 71 | if (!strcasecmp(slot, "current")) |
74bb2dfb | 72 | return BRANCH_COLOR_CURRENT; |
8852117a | 73 | if (!strcasecmp(slot, "upstream")) |
dbda21fa | 74 | return BRANCH_COLOR_UPSTREAM; |
8b8e8624 | 75 | return -1; |
a1158cae AP |
76 | } |
77 | ||
ef90d6d4 | 78 | static int git_branch_config(const char *var, const char *value, void *cb) |
a1158cae | 79 | { |
e3f1da98 RS |
80 | const char *slot_name; |
81 | ||
59556548 | 82 | if (starts_with(var, "column.")) |
ebe31ef2 | 83 | return git_column_config(var, value, "branch", &colopts); |
a1158cae | 84 | if (!strcmp(var, "color.branch")) { |
e269eb79 | 85 | branch_use_color = git_config_colorbool(var, value); |
a1158cae AP |
86 | return 0; |
87 | } | |
e3f1da98 | 88 | if (skip_prefix(var, "color.branch.", &slot_name)) { |
b9465768 | 89 | int slot = parse_branch_color_slot(slot_name); |
8b8e8624 JK |
90 | if (slot < 0) |
91 | return 0; | |
5768c98a JH |
92 | if (!value) |
93 | return config_error_nonbool(var); | |
f6c5a296 | 94 | return color_parse(value, branch_colors[slot]); |
a1158cae | 95 | } |
33c643bb | 96 | return git_color_default_config(var, value, cb); |
a1158cae AP |
97 | } |
98 | ||
52fae7de | 99 | static const char *branch_get_color(enum color_branch ix) |
a1158cae | 100 | { |
daa0c3d9 | 101 | if (want_color(branch_use_color)) |
a1158cae AP |
102 | return branch_colors[ix]; |
103 | return ""; | |
104 | } | |
105 | ||
99c419c9 JH |
106 | static int branch_merged(int kind, const char *name, |
107 | struct commit *rev, struct commit *head_rev) | |
108 | { | |
109 | /* | |
110 | * This checks whether the merge bases of branch and HEAD (or | |
111 | * the other branch this branch builds upon) contains the | |
112 | * branch, which means that the branch has already been merged | |
113 | * safely to HEAD (or the other branch). | |
114 | */ | |
115 | struct commit *reference_rev = NULL; | |
116 | const char *reference_name = NULL; | |
96ec7b1e | 117 | void *reference_name_to_free = NULL; |
99c419c9 JH |
118 | int merged; |
119 | ||
1511b22d | 120 | if (kind == FILTER_REFS_BRANCHES) { |
99c419c9 | 121 | struct branch *branch = branch_get(name); |
3a429d0a | 122 | const char *upstream = branch_get_upstream(branch, NULL); |
0c77cd24 | 123 | struct object_id oid; |
99c419c9 | 124 | |
a9f9f8cc | 125 | if (upstream && |
96ec7b1e | 126 | (reference_name = reference_name_to_free = |
a9f9f8cc | 127 | resolve_refdup(upstream, RESOLVE_REF_READING, |
0f2dc722 | 128 | &oid, NULL)) != NULL) |
bc83266a | 129 | reference_rev = lookup_commit_reference(&oid); |
99c419c9 JH |
130 | } |
131 | if (!reference_rev) | |
132 | reference_rev = head_rev; | |
133 | ||
a20efee9 | 134 | merged = in_merge_bases(rev, reference_rev); |
99c419c9 JH |
135 | |
136 | /* | |
137 | * After the safety valve is fully redefined to "check with | |
138 | * upstream, if any, otherwise with HEAD", we should just | |
139 | * return the result of the in_merge_bases() above without | |
140 | * any of the following code, but during the transition period, | |
141 | * a gentle reminder is in order. | |
142 | */ | |
143 | if ((head_rev != reference_rev) && | |
a20efee9 | 144 | in_merge_bases(rev, head_rev) != merged) { |
99c419c9 | 145 | if (merged) |
49df4b02 | 146 | warning(_("deleting branch '%s' that has been merged to\n" |
6c80cd29 | 147 | " '%s', but not yet merged to HEAD."), |
99c419c9 JH |
148 | name, reference_name); |
149 | else | |
49df4b02 ÆAB |
150 | warning(_("not deleting branch '%s' that is not yet merged to\n" |
151 | " '%s', even though it is merged to HEAD."), | |
99c419c9 JH |
152 | name, reference_name); |
153 | } | |
96ec7b1e | 154 | free(reference_name_to_free); |
99c419c9 JH |
155 | return merged; |
156 | } | |
157 | ||
f5d0e162 | 158 | static int check_branch_commit(const char *branchname, const char *refname, |
0c77cd24 | 159 | const struct object_id *oid, struct commit *head_rev, |
f5d0e162 RS |
160 | int kinds, int force) |
161 | { | |
bc83266a | 162 | struct commit *rev = lookup_commit_reference(oid); |
f5d0e162 RS |
163 | if (!rev) { |
164 | error(_("Couldn't look up commit object for '%s'"), refname); | |
165 | return -1; | |
166 | } | |
167 | if (!force && !branch_merged(kinds, branchname, rev, head_rev)) { | |
168 | error(_("The branch '%s' is not fully merged.\n" | |
169 | "If you are sure you want to delete it, " | |
170 | "run 'git branch -D %s'."), branchname, branchname); | |
171 | return -1; | |
172 | } | |
173 | return 0; | |
174 | } | |
175 | ||
22ed7927 RS |
176 | static void delete_branch_config(const char *branchname) |
177 | { | |
178 | struct strbuf buf = STRBUF_INIT; | |
179 | strbuf_addf(&buf, "branch.%s", branchname); | |
180 | if (git_config_rename_section(buf.buf, NULL) < 0) | |
181 | warning(_("Update of config-file failed")); | |
182 | strbuf_release(&buf); | |
183 | } | |
184 | ||
d65ddf19 JK |
185 | static int delete_branches(int argc, const char **argv, int force, int kinds, |
186 | int quiet) | |
c31820c2 | 187 | { |
f5d0e162 | 188 | struct commit *head_rev = NULL; |
0c77cd24 | 189 | struct object_id oid; |
b8e9a00d | 190 | char *name = NULL; |
c179837c | 191 | const char *fmt; |
c31820c2 | 192 | int i; |
b8e9a00d | 193 | int ret = 0; |
c179837c | 194 | int remote_branch = 0; |
8415d5c7 | 195 | struct strbuf bname = STRBUF_INIT; |
6b145e01 | 196 | unsigned allowed_interpret; |
c31820c2 | 197 | |
f3d985c3 | 198 | switch (kinds) { |
1511b22d | 199 | case FILTER_REFS_REMOTES: |
f3d985c3 | 200 | fmt = "refs/remotes/%s"; |
c179837c ÆAB |
201 | /* For subsequent UI messages */ |
202 | remote_branch = 1; | |
6b145e01 | 203 | allowed_interpret = INTERPRET_BRANCH_REMOTE; |
c179837c | 204 | |
f3d985c3 JH |
205 | force = 1; |
206 | break; | |
1511b22d | 207 | case FILTER_REFS_BRANCHES: |
f3d985c3 | 208 | fmt = "refs/heads/%s"; |
6b145e01 | 209 | allowed_interpret = INTERPRET_BRANCH_LOCAL; |
f3d985c3 JH |
210 | break; |
211 | default: | |
49df4b02 | 212 | die(_("cannot use -a with -d")); |
f3d985c3 | 213 | } |
c31820c2 | 214 | |
67affd51 | 215 | if (!force) { |
bc83266a | 216 | head_rev = lookup_commit_reference(&head_oid); |
67affd51 | 217 | if (!head_rev) |
49df4b02 | 218 | die(_("Couldn't look up commit object for HEAD")); |
67affd51 | 219 | } |
a9155c50 | 220 | for (i = 0; i < argc; i++, strbuf_reset(&bname)) { |
8bb04553 | 221 | char *target = NULL; |
0fe700e3 RS |
222 | int flags = 0; |
223 | ||
6b145e01 | 224 | strbuf_branchname(&bname, argv[i], allowed_interpret); |
8e0f7003 | 225 | free(name); |
4e2d094d | 226 | name = mkpathdup(fmt, bname.buf); |
f292244c KY |
227 | |
228 | if (kinds == FILTER_REFS_BRANCHES) { | |
d3b9ac07 NTND |
229 | const struct worktree *wt = |
230 | find_shared_symref("HEAD", name); | |
231 | if (wt) { | |
f292244c KY |
232 | error(_("Cannot delete branch '%s' " |
233 | "checked out at '%s'"), | |
d3b9ac07 | 234 | bname.buf, wt->path); |
f292244c KY |
235 | ret = 1; |
236 | continue; | |
237 | } | |
238 | } | |
239 | ||
8bb04553 MH |
240 | target = resolve_refdup(name, |
241 | RESOLVE_REF_READING | |
242 | | RESOLVE_REF_NO_RECURSE | |
243 | | RESOLVE_REF_ALLOW_BAD_NAME, | |
0f2dc722 | 244 | &oid, &flags); |
18f29fc6 | 245 | if (!target) { |
c179837c | 246 | error(remote_branch |
ccd593cf | 247 | ? _("remote-tracking branch '%s' not found.") |
c179837c | 248 | : _("branch '%s' not found."), bname.buf); |
b8e9a00d QT |
249 | ret = 1; |
250 | continue; | |
251 | } | |
c31820c2 | 252 | |
d0f810f0 | 253 | if (!(flags & (REF_ISSYMREF|REF_ISBROKEN)) && |
0c77cd24 | 254 | check_branch_commit(bname.buf, name, &oid, head_rev, kinds, |
f5d0e162 | 255 | force)) { |
b8e9a00d | 256 | ret = 1; |
8bb04553 | 257 | goto next; |
c31820c2 LH |
258 | } |
259 | ||
2616a5e5 | 260 | if (delete_ref(NULL, name, is_null_oid(&oid) ? NULL : &oid, |
91774afc | 261 | REF_NO_DEREF)) { |
c179837c | 262 | error(remote_branch |
ccd593cf | 263 | ? _("Error deleting remote-tracking branch '%s'") |
c179837c | 264 | : _("Error deleting branch '%s'"), |
8415d5c7 | 265 | bname.buf); |
b8e9a00d | 266 | ret = 1; |
8bb04553 | 267 | goto next; |
13baa9fe RS |
268 | } |
269 | if (!quiet) { | |
270 | printf(remote_branch | |
ccd593cf | 271 | ? _("Deleted remote-tracking branch %s (was %s).\n") |
13baa9fe RS |
272 | : _("Deleted branch %s (was %s).\n"), |
273 | bname.buf, | |
d0f810f0 RS |
274 | (flags & REF_ISBROKEN) ? "broken" |
275 | : (flags & REF_ISSYMREF) ? target | |
0c77cd24 | 276 | : find_unique_abbrev(oid.hash, DEFAULT_ABBREV)); |
f1eccbab | 277 | } |
13baa9fe | 278 | delete_branch_config(bname.buf); |
8bb04553 MH |
279 | |
280 | next: | |
281 | free(target); | |
c31820c2 | 282 | } |
c31820c2 | 283 | |
8e0f7003 | 284 | free(name); |
a9155c50 | 285 | strbuf_release(&bname); |
b8e9a00d | 286 | |
a9155c50 | 287 | return ret; |
c31820c2 | 288 | } |
c31820c2 | 289 | |
949af068 | 290 | static int calc_maxwidth(struct ref_array *refs, int remote_bonus) |
94fcb730 | 291 | { |
949af068 KN |
292 | int i, max = 0; |
293 | for (i = 0; i < refs->nr; i++) { | |
294 | struct ref_array_item *it = refs->items[i]; | |
295 | const char *desc = it->refname; | |
296 | int w; | |
dbda21fa | 297 | |
949af068 KN |
298 | skip_prefix(it->refname, "refs/heads/", &desc); |
299 | skip_prefix(it->refname, "refs/remotes/", &desc); | |
300 | if (it->kind == FILTER_REFS_DETACHED_HEAD) { | |
301 | char *head_desc = get_head_description(); | |
302 | w = utf8_strwidth(head_desc); | |
303 | free(head_desc); | |
304 | } else | |
305 | w = utf8_strwidth(desc); | |
21dfc09d | 306 | |
949af068 KN |
307 | if (it->kind == FILTER_REFS_REMOTES) |
308 | w += remote_bonus; | |
309 | if (w > max) | |
310 | max = w; | |
21dfc09d | 311 | } |
949af068 | 312 | return max; |
94fcb730 JH |
313 | } |
314 | ||
949af068 | 315 | static const char *quote_literal_for_format(const char *s) |
6e0332ec | 316 | { |
949af068 KN |
317 | static struct strbuf buf = STRBUF_INIT; |
318 | ||
319 | strbuf_reset(&buf); | |
320 | while (*s) { | |
321 | const char *ep = strchrnul(s, '%'); | |
322 | if (s < ep) | |
323 | strbuf_add(&buf, s, ep - s); | |
324 | if (*ep == '%') { | |
325 | strbuf_addstr(&buf, "%%"); | |
326 | s = ep + 1; | |
327 | } else { | |
328 | s = ep; | |
329 | } | |
6e0332ec | 330 | } |
949af068 | 331 | return buf.buf; |
6e0332ec JN |
332 | } |
333 | ||
949af068 | 334 | static char *build_format(struct ref_filter *filter, int maxwidth, const char *remote_prefix) |
75e6e213 | 335 | { |
949af068 KN |
336 | struct strbuf fmt = STRBUF_INIT; |
337 | struct strbuf local = STRBUF_INIT; | |
338 | struct strbuf remote = STRBUF_INIT; | |
75e6e213 | 339 | |
34d820ee JK |
340 | strbuf_addf(&local, "%%(if)%%(HEAD)%%(then)* %s%%(else) %s%%(end)", |
341 | branch_get_color(BRANCH_COLOR_CURRENT), | |
342 | branch_get_color(BRANCH_COLOR_LOCAL)); | |
7ca260ab JK |
343 | strbuf_addf(&remote, " %s", |
344 | branch_get_color(BRANCH_COLOR_REMOTE)); | |
75e6e213 | 345 | |
1511b22d | 346 | if (filter->verbose) { |
ac5bbc02 JH |
347 | struct strbuf obname = STRBUF_INIT; |
348 | ||
349 | if (filter->abbrev < 0) | |
350 | strbuf_addf(&obname, "%%(objectname:short)"); | |
351 | else if (!filter->abbrev) | |
352 | strbuf_addf(&obname, "%%(objectname)"); | |
353 | else | |
354 | strbuf_addf(&obname, "%%(objectname:short=%d)", filter->abbrev); | |
355 | ||
949af068 | 356 | strbuf_addf(&local, "%%(align:%d,left)%%(refname:lstrip=2)%%(end)", maxwidth); |
72d4a9a7 | 357 | strbuf_addstr(&local, branch_get_color(BRANCH_COLOR_RESET)); |
ac5bbc02 | 358 | strbuf_addf(&local, " %s ", obname.buf); |
949af068 KN |
359 | |
360 | if (filter->verbose > 1) | |
361 | strbuf_addf(&local, "%%(if)%%(upstream)%%(then)[%s%%(upstream:short)%s%%(if)%%(upstream:track)" | |
362 | "%%(then): %%(upstream:track,nobracket)%%(end)] %%(end)%%(contents:subject)", | |
363 | branch_get_color(BRANCH_COLOR_UPSTREAM), branch_get_color(BRANCH_COLOR_RESET)); | |
364 | else | |
365 | strbuf_addf(&local, "%%(if)%%(upstream:track)%%(then)%%(upstream:track) %%(end)%%(contents:subject)"); | |
366 | ||
7ca260ab | 367 | strbuf_addf(&remote, "%%(align:%d,left)%s%%(refname:lstrip=2)%%(end)%s" |
ac5bbc02 JH |
368 | "%%(if)%%(symref)%%(then) -> %%(symref:short)" |
369 | "%%(else) %s %%(contents:subject)%%(end)", | |
7ca260ab | 370 | maxwidth, quote_literal_for_format(remote_prefix), |
ac5bbc02 JH |
371 | branch_get_color(BRANCH_COLOR_RESET), obname.buf); |
372 | strbuf_release(&obname); | |
ebe31ef2 | 373 | } else { |
949af068 KN |
374 | strbuf_addf(&local, "%%(refname:lstrip=2)%s%%(if)%%(symref)%%(then) -> %%(symref:short)%%(end)", |
375 | branch_get_color(BRANCH_COLOR_RESET)); | |
7ca260ab JK |
376 | strbuf_addf(&remote, "%s%%(refname:lstrip=2)%s%%(if)%%(symref)%%(then) -> %%(symref:short)%%(end)", |
377 | quote_literal_for_format(remote_prefix), | |
949af068 | 378 | branch_get_color(BRANCH_COLOR_RESET)); |
ebe31ef2 | 379 | } |
75e6e213 | 380 | |
949af068 | 381 | strbuf_addf(&fmt, "%%(if:notequals=refs/remotes)%%(refname:rstrip=-2)%%(then)%s%%(else)%s%%(end)", local.buf, remote.buf); |
aedcb7dc | 382 | |
949af068 KN |
383 | strbuf_release(&local); |
384 | strbuf_release(&remote); | |
385 | return strbuf_detach(&fmt, NULL); | |
7e9ff00b LT |
386 | } |
387 | ||
4a68e36d | 388 | static void print_ref_list(struct ref_filter *filter, struct ref_sorting *sorting, struct ref_format *format) |
c31820c2 LH |
389 | { |
390 | int i; | |
1511b22d | 391 | struct ref_array array; |
1051e40d KN |
392 | int maxwidth = 0; |
393 | const char *remote_prefix = ""; | |
949af068 | 394 | struct strbuf out = STRBUF_INIT; |
3d9e4ce3 | 395 | char *to_free = NULL; |
1051e40d | 396 | |
35257aa0 | 397 | /* |
1051e40d KN |
398 | * If we are listing more than just remote branches, |
399 | * then remote branches will have a "remotes/" prefix. | |
400 | * We need to account for this in the width. | |
35257aa0 | 401 | */ |
1511b22d | 402 | if (filter->kind != FILTER_REFS_REMOTES) |
1051e40d | 403 | remote_prefix = "remotes/"; |
8376a704 | 404 | |
1511b22d | 405 | memset(&array, 0, sizeof(array)); |
8376a704 | 406 | |
aedcb7dc | 407 | filter_refs(&array, filter, filter->kind | FILTER_REFS_INCLUDE_BROKEN); |
c31820c2 | 408 | |
1511b22d KN |
409 | if (filter->verbose) |
410 | maxwidth = calc_maxwidth(&array, strlen(remote_prefix)); | |
bfcc9214 | 411 | |
4a68e36d JK |
412 | if (!format->format) |
413 | format->format = to_free = build_format(filter, maxwidth, remote_prefix); | |
11b087ad | 414 | format->use_color = branch_use_color; |
2eda0102 JK |
415 | |
416 | if (verify_ref_format(format)) | |
417 | die(_("unable to parse format string")); | |
949af068 | 418 | |
aedcb7dc | 419 | ref_array_sort(sorting, &array); |
1603ade8 | 420 | |
949af068 | 421 | for (i = 0; i < array.nr; i++) { |
4a68e36d | 422 | format_ref_array_item(array.items[i], format, &out); |
949af068 KN |
423 | if (column_active(colopts)) { |
424 | assert(!filter->verbose && "--column and --verbose are incompatible"); | |
425 | /* format to a string_list to let print_columns() do its job */ | |
426 | string_list_append(&output, out.buf); | |
427 | } else { | |
428 | fwrite(out.buf, 1, out.len, stdout); | |
429 | putchar('\n'); | |
430 | } | |
431 | strbuf_release(&out); | |
432 | } | |
0e9716e6 | 433 | |
1511b22d | 434 | ref_array_clear(&array); |
3d9e4ce3 | 435 | free(to_free); |
c31820c2 LH |
436 | } |
437 | ||
14ace5b7 NTND |
438 | static void reject_rebase_or_bisect_branch(const char *target) |
439 | { | |
4fff1ef7 | 440 | struct worktree **worktrees = get_worktrees(0); |
14ace5b7 NTND |
441 | int i; |
442 | ||
443 | for (i = 0; worktrees[i]; i++) { | |
444 | struct worktree *wt = worktrees[i]; | |
445 | ||
446 | if (!wt->is_detached) | |
447 | continue; | |
448 | ||
449 | if (is_worktree_being_rebased(wt, target)) | |
450 | die(_("Branch %s is being rebased at %s"), | |
451 | target, wt->path); | |
452 | ||
453 | if (is_worktree_being_bisected(wt, target)) | |
454 | die(_("Branch %s is being bisected at %s"), | |
455 | target, wt->path); | |
456 | } | |
457 | ||
458 | free_worktrees(worktrees); | |
459 | } | |
460 | ||
52d59cc6 | 461 | static void copy_or_rename_branch(const char *oldname, const char *newname, int copy, int force) |
c976d415 | 462 | { |
da3f78a2 | 463 | struct strbuf oldref = STRBUF_INIT, newref = STRBUF_INIT, logmsg = STRBUF_INIT; |
da3f78a2 | 464 | struct strbuf oldsection = STRBUF_INIT, newsection = STRBUF_INIT; |
255073ca KS |
465 | const char *interpreted_oldname = NULL; |
466 | const char *interpreted_newname = NULL; | |
cbdffe40 | 467 | int recovery = 0; |
c976d415 | 468 | |
52d59cc6 SD |
469 | if (!oldname) { |
470 | if (copy) | |
471 | die(_("cannot copy the current branch while not on any.")); | |
472 | else | |
473 | die(_("cannot rename the current branch while not on any.")); | |
474 | } | |
c847f537 | 475 | |
cbdffe40 JH |
476 | if (strbuf_check_branch_ref(&oldref, oldname)) { |
477 | /* | |
478 | * Bad name --- this could be an attempt to rename a | |
479 | * ref that we used to allow to be created by accident. | |
480 | */ | |
c6893323 | 481 | if (ref_exists(oldref.buf)) |
cbdffe40 JH |
482 | recovery = 1; |
483 | else | |
49df4b02 | 484 | die(_("Invalid branch name: '%s'"), oldname); |
cbdffe40 | 485 | } |
c976d415 | 486 | |
3f59481e JN |
487 | /* |
488 | * A command like "git branch -M currentbranch currentbranch" cannot | |
489 | * cause the worktree to become inconsistent with HEAD, so allow it. | |
490 | */ | |
bc1c9c0e JH |
491 | if (!strcmp(oldname, newname)) |
492 | validate_branchname(newname, &newref); | |
493 | else | |
494 | validate_new_branchname(newname, &newref, force); | |
c976d415 | 495 | |
14ace5b7 NTND |
496 | reject_rebase_or_bisect_branch(oldref.buf); |
497 | ||
255073ca KS |
498 | if (!skip_prefix(oldref.buf, "refs/heads/", &interpreted_oldname) || |
499 | !skip_prefix(newref.buf, "refs/heads/", &interpreted_newname)) { | |
500 | die("BUG: expected prefix missing for refs"); | |
501 | } | |
502 | ||
52d59cc6 SD |
503 | if (copy) |
504 | strbuf_addf(&logmsg, "Branch: copied %s to %s", | |
505 | oldref.buf, newref.buf); | |
506 | else | |
507 | strbuf_addf(&logmsg, "Branch: renamed %s to %s", | |
508 | oldref.buf, newref.buf); | |
678d0f4c | 509 | |
52d59cc6 | 510 | if (!copy && rename_ref(oldref.buf, newref.buf, logmsg.buf)) |
49df4b02 | 511 | die(_("Branch rename failed")); |
52d59cc6 SD |
512 | if (copy && copy_existing_ref(oldref.buf, newref.buf, logmsg.buf)) |
513 | die(_("Branch copy failed")); | |
c976d415 | 514 | |
52d59cc6 SD |
515 | if (recovery) { |
516 | if (copy) | |
a48ebe97 | 517 | warning(_("Created a copy of a misnamed branch '%s'"), |
255073ca | 518 | interpreted_oldname); |
52d59cc6 SD |
519 | else |
520 | warning(_("Renamed a misnamed branch '%s' away"), | |
255073ca | 521 | interpreted_oldname); |
52d59cc6 | 522 | } |
cbdffe40 | 523 | |
e5435ff1 JH |
524 | if (!copy && |
525 | replace_each_worktree_head_symref(oldref.buf, newref.buf, logmsg.buf)) | |
49df4b02 | 526 | die(_("Branch renamed to %s, but HEAD is not updated!"), newname); |
19eba151 | 527 | |
39ee4c6c KM |
528 | strbuf_release(&logmsg); |
529 | ||
255073ca | 530 | strbuf_addf(&oldsection, "branch.%s", interpreted_oldname); |
da3f78a2 | 531 | strbuf_release(&oldref); |
255073ca | 532 | strbuf_addf(&newsection, "branch.%s", interpreted_newname); |
da3f78a2 | 533 | strbuf_release(&newref); |
52d59cc6 | 534 | if (!copy && git_config_rename_section(oldsection.buf, newsection.buf) < 0) |
49df4b02 | 535 | die(_("Branch is renamed, but update of config-file failed")); |
52d59cc6 SD |
536 | if (copy && strcmp(oldname, newname) && git_config_copy_section(oldsection.buf, newsection.buf) < 0) |
537 | die(_("Branch is copied, but update of config-file failed")); | |
da3f78a2 MV |
538 | strbuf_release(&oldsection); |
539 | strbuf_release(&newsection); | |
c976d415 LH |
540 | } |
541 | ||
c10388c7 | 542 | static GIT_PATH_FUNC(edit_description, "EDIT_DESCRIPTION") |
b7200e83 JH |
543 | |
544 | static int edit_branch_description(const char *branch_name) | |
545 | { | |
b7200e83 JH |
546 | struct strbuf buf = STRBUF_INIT; |
547 | struct strbuf name = STRBUF_INIT; | |
548 | ||
549 | read_branch_desc(&buf, branch_name); | |
550 | if (!buf.len || buf.buf[buf.len-1] != '\n') | |
551 | strbuf_addch(&buf, '\n'); | |
eff80a9f | 552 | strbuf_commented_addf(&buf, |
b18237f4 VA |
553 | _("Please edit the description for the branch\n" |
554 | " %s\n" | |
555 | "Lines starting with '%c' will be stripped.\n"), | |
eff80a9f | 556 | branch_name, comment_line_char); |
c10388c7 | 557 | write_file_buf(edit_description(), buf.buf, buf.len); |
b7200e83 | 558 | strbuf_reset(&buf); |
c10388c7 | 559 | if (launch_editor(edit_description(), &buf, NULL)) { |
b7200e83 JH |
560 | strbuf_release(&buf); |
561 | return -1; | |
562 | } | |
63af4a84 | 563 | strbuf_stripspace(&buf, 1); |
b7200e83 JH |
564 | |
565 | strbuf_addf(&name, "branch.%s.description", branch_name); | |
3d180648 | 566 | git_config_set(name.buf, buf.len ? buf.buf : NULL); |
b7200e83 JH |
567 | strbuf_release(&name); |
568 | strbuf_release(&buf); | |
569 | ||
bd25f890 | 570 | return 0; |
b7200e83 JH |
571 | } |
572 | ||
c31820c2 LH |
573 | int cmd_branch(int argc, const char **argv, const char *prefix) |
574 | { | |
52d59cc6 | 575 | int delete = 0, rename = 0, copy = 0, force = 0, list = 0; |
b7200e83 | 576 | int reflog = 0, edit_description = 0; |
b84869ef | 577 | int quiet = 0, unset_upstream = 0; |
6183d826 | 578 | const char *new_upstream = NULL; |
9ed36cfa | 579 | enum branch_track track; |
1511b22d | 580 | struct ref_filter filter; |
3bb16a8b | 581 | int icase = 0; |
aedcb7dc | 582 | static struct ref_sorting *sorting = NULL, **sorting_tail = &sorting; |
4a68e36d | 583 | struct ref_format format = REF_FORMAT_INIT; |
a8dfd5ea PH |
584 | |
585 | struct option options[] = { | |
24a85214 | 586 | OPT_GROUP(N_("Generic options")), |
1511b22d | 587 | OPT__VERBOSE(&filter.verbose, |
24a85214 NTND |
588 | N_("show hash and subject, give twice for upstream branch")), |
589 | OPT__QUIET(&quiet, N_("suppress informational messages")), | |
590 | OPT_SET_INT('t', "track", &track, N_("set up tracking mode (see git-pull(1))"), | |
9ed36cfa | 591 | BRANCH_TRACK_EXPLICIT), |
52668846 KS |
592 | { OPTION_SET_INT, 0, "set-upstream", &track, NULL, N_("do not use"), |
593 | PARSE_OPT_NOARG | PARSE_OPT_HIDDEN, NULL, BRANCH_TRACK_OVERRIDE }, | |
ab86885a | 594 | OPT_STRING('u', "set-upstream-to", &new_upstream, N_("upstream"), N_("change the upstream info")), |
fb4cc6a9 | 595 | OPT_BOOL(0, "unset-upstream", &unset_upstream, N_("Unset the upstream info")), |
24a85214 | 596 | OPT__COLOR(&branch_use_color, N_("use colored output")), |
1511b22d KN |
597 | OPT_SET_INT('r', "remotes", &filter.kind, N_("act on remote-tracking branches"), |
598 | FILTER_REFS_REMOTES), | |
599 | OPT_CONTAINS(&filter.with_commit, N_("print only branches that contain the commit")), | |
ac3f5a34 | 600 | OPT_NO_CONTAINS(&filter.no_commit, N_("print only branches that don't contain the commit")), |
1511b22d | 601 | OPT_WITH(&filter.with_commit, N_("print only branches that contain the commit")), |
ac3f5a34 | 602 | OPT_WITHOUT(&filter.no_commit, N_("print only branches that don't contain the commit")), |
1511b22d | 603 | OPT__ABBREV(&filter.abbrev), |
a8dfd5ea | 604 | |
24a85214 | 605 | OPT_GROUP(N_("Specific git-branch actions:")), |
1511b22d KN |
606 | OPT_SET_INT('a', "all", &filter.kind, N_("list both remote-tracking and local branches"), |
607 | FILTER_REFS_REMOTES | FILTER_REFS_BRANCHES), | |
24a85214 NTND |
608 | OPT_BIT('d', "delete", &delete, N_("delete fully merged branch"), 1), |
609 | OPT_BIT('D', NULL, &delete, N_("delete branch (even if not merged)"), 2), | |
610 | OPT_BIT('m', "move", &rename, N_("move/rename a branch and its reflog"), 1), | |
611 | OPT_BIT('M', NULL, &rename, N_("move/rename a branch, even if target exists"), 2), | |
52d59cc6 SD |
612 | OPT_BIT('c', "copy", ©, N_("copy a branch and its reflog"), 1), |
613 | OPT_BIT('C', NULL, ©, N_("copy a branch, even if target exists"), 2), | |
d5d09d47 SB |
614 | OPT_BOOL(0, "list", &list, N_("list branch names")), |
615 | OPT_BOOL('l', "create-reflog", &reflog, N_("create the branch's reflog")), | |
616 | OPT_BOOL(0, "edit-description", &edit_description, | |
617 | N_("edit the description for the branch")), | |
356e91f2 | 618 | OPT__FORCE(&force, N_("force creation, move/rename, deletion")), |
1511b22d KN |
619 | OPT_MERGED(&filter, N_("print only branches that are merged")), |
620 | OPT_NO_MERGED(&filter, N_("print only branches that are not merged")), | |
24a85214 | 621 | OPT_COLUMN(0, "column", &colopts, N_("list branches in columns")), |
aedcb7dc KN |
622 | OPT_CALLBACK(0 , "sort", sorting_tail, N_("key"), |
623 | N_("field name to sort on"), &parse_opt_ref_sorting), | |
049716b3 | 624 | { |
aa3bc55e KN |
625 | OPTION_CALLBACK, 0, "points-at", &filter.points_at, N_("object"), |
626 | N_("print only branches of the object"), 0, parse_opt_object_name | |
049716b3 | 627 | }, |
3bb16a8b | 628 | OPT_BOOL('i', "ignore-case", &icase, N_("sorting and filtering are case insensitive")), |
4a68e36d | 629 | OPT_STRING( 0 , "format", &format.format, N_("format"), N_("format to use for the output")), |
a8dfd5ea PH |
630 | OPT_END(), |
631 | }; | |
c31820c2 | 632 | |
56b43607 KN |
633 | setup_ref_filter_porcelain_msg(); |
634 | ||
1511b22d KN |
635 | memset(&filter, 0, sizeof(filter)); |
636 | filter.kind = FILTER_REFS_BRANCHES; | |
637 | filter.abbrev = -1; | |
638 | ||
1dacfbcf NTND |
639 | if (argc == 2 && !strcmp(argv[1], "-h")) |
640 | usage_with_options(builtin_branch_usage, options); | |
641 | ||
ef90d6d4 | 642 | git_config(git_branch_config, NULL); |
6b2f2d98 | 643 | |
9ed36cfa | 644 | track = git_branch_track; |
c976d415 | 645 | |
0f2dc722 | 646 | head = resolve_refdup("HEAD", 0, &head_oid, NULL); |
c31820c2 | 647 | if (!head) |
49df4b02 | 648 | die(_("Failed to resolve HEAD as a valid ref.")); |
e3f1da98 | 649 | if (!strcmp(head, "HEAD")) |
1511b22d | 650 | filter.detached = 1; |
e3f1da98 RS |
651 | else if (!skip_prefix(head, "refs/heads/", &head)) |
652 | die(_("HEAD not found below refs/heads!")); | |
ebe31ef2 | 653 | |
37782920 SB |
654 | argc = parse_options(argc, argv, prefix, options, builtin_branch_usage, |
655 | 0); | |
cddd127b | 656 | |
52d59cc6 | 657 | if (!delete && !rename && !copy && !edit_description && !new_upstream && !unset_upstream && argc == 0) |
cddd127b MG |
658 | list = 1; |
659 | ||
ac3f5a34 ÆAB |
660 | if (filter.with_commit || filter.merge != REF_FILTER_MERGED_NONE || filter.points_at.nr || |
661 | filter.no_commit) | |
d0403508 JK |
662 | list = 1; |
663 | ||
52d59cc6 | 664 | if (!!delete + !!rename + !!copy + !!new_upstream + |
05efb7b7 | 665 | list + unset_upstream > 1) |
049716b3 | 666 | usage_with_options(builtin_branch_usage, options); |
c31820c2 | 667 | |
1511b22d KN |
668 | if (filter.abbrev == -1) |
669 | filter.abbrev = DEFAULT_ABBREV; | |
3bb16a8b NTND |
670 | filter.ignore_case = icase; |
671 | ||
ebe31ef2 | 672 | finalize_colopts(&colopts, -1); |
1511b22d | 673 | if (filter.verbose) { |
ebe31ef2 NTND |
674 | if (explicitly_enable_column(colopts)) |
675 | die(_("--column and --verbose are incompatible")); | |
676 | colopts = 0; | |
677 | } | |
b792c067 | 678 | |
356e91f2 MG |
679 | if (force) { |
680 | delete *= 2; | |
681 | rename *= 2; | |
52d59cc6 | 682 | copy *= 2; |
356e91f2 MG |
683 | } |
684 | ||
d74b541e | 685 | if (list) |
0ae19de7 | 686 | setup_auto_pager("branch", 1); |
d74b541e | 687 | |
640d0401 NTND |
688 | if (delete) { |
689 | if (!argc) | |
690 | die(_("branch name required")); | |
1511b22d | 691 | return delete_branches(argc, argv, delete > 1, filter.kind, quiet); |
640d0401 | 692 | } else if (list) { |
23e714df | 693 | /* git branch --local also shows HEAD when it is detached */ |
1511b22d KN |
694 | if ((filter.kind & FILTER_REFS_BRANCHES) && filter.detached) |
695 | filter.kind |= FILTER_REFS_DETACHED_HEAD; | |
696 | filter.name_patterns = argv; | |
3bb16a8b NTND |
697 | /* |
698 | * If no sorting parameter is given then we default to sorting | |
699 | * by 'refname'. This would give us an alphabetically sorted | |
700 | * array with the 'HEAD' ref at the beginning followed by | |
701 | * local branches 'refs/heads/...' and finally remote-tacking | |
702 | * branches 'refs/remotes/...'. | |
703 | */ | |
704 | if (!sorting) | |
705 | sorting = ref_default_sorting(); | |
706 | sorting->ignore_case = icase; | |
4a68e36d | 707 | print_ref_list(&filter, sorting, &format); |
ebe31ef2 NTND |
708 | print_columns(&output, colopts, NULL); |
709 | string_list_clear(&output, 0); | |
ca417990 | 710 | return 0; |
ebe31ef2 | 711 | } |
b7200e83 JH |
712 | else if (edit_description) { |
713 | const char *branch_name; | |
c2d17ba3 JH |
714 | struct strbuf branch_ref = STRBUF_INIT; |
715 | ||
75135b23 | 716 | if (!argc) { |
1511b22d | 717 | if (filter.detached) |
045e3884 | 718 | die(_("Cannot give description to detached HEAD")); |
b7200e83 | 719 | branch_name = head; |
75135b23 | 720 | } else if (argc == 1) |
b7200e83 JH |
721 | branch_name = argv[0]; |
722 | else | |
43722c4d | 723 | die(_("cannot edit description of more than one branch")); |
c2d17ba3 JH |
724 | |
725 | strbuf_addf(&branch_ref, "refs/heads/%s", branch_name); | |
726 | if (!ref_exists(branch_ref.buf)) { | |
727 | strbuf_release(&branch_ref); | |
728 | ||
729 | if (!argc) | |
045e3884 | 730 | return error(_("No commit on branch '%s' yet."), |
c2d17ba3 JH |
731 | branch_name); |
732 | else | |
045e3884 NTND |
733 | return error(_("No branch named '%s'."), |
734 | branch_name); | |
c2d17ba3 JH |
735 | } |
736 | strbuf_release(&branch_ref); | |
737 | ||
b7200e83 JH |
738 | if (edit_branch_description(branch_name)) |
739 | return 1; | |
52d59cc6 SD |
740 | } else if (copy) { |
741 | if (!argc) | |
742 | die(_("branch name required")); | |
743 | else if (argc == 1) | |
744 | copy_or_rename_branch(head, argv[0], 1, copy > 1); | |
745 | else if (argc == 2) | |
746 | copy_or_rename_branch(argv[0], argv[1], 1, copy > 1); | |
747 | else | |
748 | die(_("too many branches for a copy operation")); | |
a4043aea | 749 | } else if (rename) { |
d1520c4b JM |
750 | if (!argc) |
751 | die(_("branch name required")); | |
752 | else if (argc == 1) | |
52d59cc6 | 753 | copy_or_rename_branch(head, argv[0], 0, rename > 1); |
3706ed29 | 754 | else if (argc == 2) |
52d59cc6 | 755 | copy_or_rename_branch(argv[0], argv[1], 0, rename > 1); |
3706ed29 | 756 | else |
f7776235 | 757 | die(_("too many arguments for a rename operation")); |
6183d826 CMN |
758 | } else if (new_upstream) { |
759 | struct branch *branch = branch_get(argv[0]); | |
760 | ||
8efb8899 | 761 | if (argc > 1) |
f7776235 | 762 | die(_("too many arguments to set new upstream")); |
8efb8899 NTND |
763 | |
764 | if (!branch) { | |
765 | if (!argc || !strcmp(argv[0], "HEAD")) | |
766 | die(_("could not set upstream of HEAD to %s when " | |
767 | "it does not point to any branch."), | |
768 | new_upstream); | |
769 | die(_("no such branch '%s'"), argv[0]); | |
770 | } | |
771 | ||
6183d826 CMN |
772 | if (!ref_exists(branch->refname)) |
773 | die(_("branch '%s' does not exist"), branch->name); | |
774 | ||
775 | /* | |
776 | * create_branch takes care of setting up the tracking | |
777 | * info and making sure new_upstream is correct | |
778 | */ | |
4bd488ea | 779 | create_branch(branch->name, new_upstream, 0, 0, 0, quiet, BRANCH_TRACK_OVERRIDE); |
b84869ef CMN |
780 | } else if (unset_upstream) { |
781 | struct branch *branch = branch_get(argv[0]); | |
782 | struct strbuf buf = STRBUF_INIT; | |
783 | ||
8efb8899 | 784 | if (argc > 1) |
f7776235 | 785 | die(_("too many arguments to unset upstream")); |
8efb8899 NTND |
786 | |
787 | if (!branch) { | |
788 | if (!argc || !strcmp(argv[0], "HEAD")) | |
789 | die(_("could not unset upstream of HEAD when " | |
790 | "it does not point to any branch.")); | |
791 | die(_("no such branch '%s'"), argv[0]); | |
792 | } | |
793 | ||
54d07f2e | 794 | if (!branch_has_merge_config(branch)) |
b84869ef | 795 | die(_("Branch '%s' has no upstream information"), branch->name); |
b84869ef CMN |
796 | |
797 | strbuf_addf(&buf, "branch.%s.remote", branch->name); | |
3d180648 | 798 | git_config_set_multivar(buf.buf, NULL, NULL, 1); |
b84869ef CMN |
799 | strbuf_reset(&buf); |
800 | strbuf_addf(&buf, "branch.%s.merge", branch->name); | |
3d180648 | 801 | git_config_set_multivar(buf.buf, NULL, NULL, 1); |
b84869ef | 802 | strbuf_release(&buf); |
5cd75c7d | 803 | } else if (argc > 0 && argc <= 2) { |
b347d06b | 804 | struct branch *branch = branch_get(argv[0]); |
b347d06b | 805 | |
8efb8899 NTND |
806 | if (!branch) |
807 | die(_("no such branch '%s'"), argv[0]); | |
808 | ||
1511b22d | 809 | if (filter.kind != FILTER_REFS_BRANCHES) |
49df4b02 | 810 | die(_("-a and -r options to 'git branch' do not make sense with a branch name")); |
b347d06b CMN |
811 | |
812 | if (track == BRANCH_TRACK_OVERRIDE) | |
52668846 | 813 | die(_("the '--set-upstream' option is no longer supported. Please use '--track' or '--set-upstream-to' instead.")); |
b347d06b | 814 | |
4bd488ea | 815 | create_branch(argv[0], (argc == 2) ? argv[1] : head, |
e2bbd0cc | 816 | force, 0, reflog, quiet, track); |
b347d06b | 817 | |
6e8f993a | 818 | } else |
a8dfd5ea | 819 | usage_with_options(builtin_branch_usage, options); |
c31820c2 LH |
820 | |
821 | return 0; | |
822 | } |