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