]>
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" |
a8dfd5ea PH |
22 | |
23 | static const char * const builtin_branch_usage[] = { | |
24a85214 NTND |
24 | N_("git branch [options] [-r | -a] [--merged | --no-merged]"), |
25 | N_("git branch [options] [-l] [-f] <branchname> [<start-point>]"), | |
26 | N_("git branch [options] [-r] (-d | -D) <branchname>..."), | |
27 | N_("git branch [options] (-m | -M) [<oldbranch>] <newbranch>"), | |
a8dfd5ea PH |
28 | NULL |
29 | }; | |
c31820c2 | 30 | |
f3d985c3 JH |
31 | #define REF_LOCAL_BRANCH 0x01 |
32 | #define REF_REMOTE_BRANCH 0x02 | |
c31820c2 LH |
33 | |
34 | static const char *head; | |
35 | static unsigned char head_sha1[20]; | |
36 | ||
6b2f2d98 | 37 | static int branch_use_color = -1; |
a1158cae | 38 | static char branch_colors[][COLOR_MAXLEN] = { |
dc6ebd4c AL |
39 | GIT_COLOR_RESET, |
40 | GIT_COLOR_NORMAL, /* PLAIN */ | |
41 | GIT_COLOR_RED, /* REMOTE */ | |
42 | GIT_COLOR_NORMAL, /* LOCAL */ | |
43 | GIT_COLOR_GREEN, /* CURRENT */ | |
dbda21fa | 44 | GIT_COLOR_BLUE, /* UPSTREAM */ |
a1158cae AP |
45 | }; |
46 | enum color_branch { | |
74bb2dfb AL |
47 | BRANCH_COLOR_RESET = 0, |
48 | BRANCH_COLOR_PLAIN = 1, | |
49 | BRANCH_COLOR_REMOTE = 2, | |
50 | BRANCH_COLOR_LOCAL = 3, | |
dbda21fa FC |
51 | BRANCH_COLOR_CURRENT = 4, |
52 | BRANCH_COLOR_UPSTREAM = 5 | |
a1158cae AP |
53 | }; |
54 | ||
049716b3 JH |
55 | static enum merge_filter { |
56 | NO_FILTER = 0, | |
57 | SHOW_NOT_MERGED, | |
4b05548f | 58 | SHOW_MERGED |
049716b3 JH |
59 | } merge_filter; |
60 | static unsigned char merge_filter_ref[20]; | |
e8b404c2 | 61 | |
ebe31ef2 NTND |
62 | static struct string_list output = STRING_LIST_INIT_DUP; |
63 | static unsigned int colopts; | |
64 | ||
a1158cae AP |
65 | static int parse_branch_color_slot(const char *var, int ofs) |
66 | { | |
67 | if (!strcasecmp(var+ofs, "plain")) | |
74bb2dfb | 68 | return BRANCH_COLOR_PLAIN; |
a1158cae | 69 | if (!strcasecmp(var+ofs, "reset")) |
74bb2dfb | 70 | return BRANCH_COLOR_RESET; |
a1158cae | 71 | if (!strcasecmp(var+ofs, "remote")) |
74bb2dfb | 72 | return BRANCH_COLOR_REMOTE; |
a1158cae | 73 | if (!strcasecmp(var+ofs, "local")) |
74bb2dfb | 74 | return BRANCH_COLOR_LOCAL; |
a1158cae | 75 | if (!strcasecmp(var+ofs, "current")) |
74bb2dfb | 76 | return BRANCH_COLOR_CURRENT; |
dbda21fa FC |
77 | if (!strcasecmp(var+ofs, "upstream")) |
78 | return BRANCH_COLOR_UPSTREAM; | |
8b8e8624 | 79 | return -1; |
a1158cae AP |
80 | } |
81 | ||
ef90d6d4 | 82 | static int git_branch_config(const char *var, const char *value, void *cb) |
a1158cae | 83 | { |
59556548 | 84 | if (starts_with(var, "column.")) |
ebe31ef2 | 85 | return git_column_config(var, value, "branch", &colopts); |
a1158cae | 86 | if (!strcmp(var, "color.branch")) { |
e269eb79 | 87 | branch_use_color = git_config_colorbool(var, value); |
a1158cae AP |
88 | return 0; |
89 | } | |
59556548 | 90 | if (starts_with(var, "color.branch.")) { |
a1158cae | 91 | int slot = parse_branch_color_slot(var, 13); |
8b8e8624 JK |
92 | if (slot < 0) |
93 | return 0; | |
5768c98a JH |
94 | if (!value) |
95 | return config_error_nonbool(var); | |
a1158cae AP |
96 | color_parse(value, var, branch_colors[slot]); |
97 | return 0; | |
98 | } | |
ef90d6d4 | 99 | return git_color_default_config(var, value, cb); |
a1158cae AP |
100 | } |
101 | ||
52fae7de | 102 | static const char *branch_get_color(enum color_branch ix) |
a1158cae | 103 | { |
daa0c3d9 | 104 | if (want_color(branch_use_color)) |
a1158cae AP |
105 | return branch_colors[ix]; |
106 | return ""; | |
107 | } | |
108 | ||
99c419c9 JH |
109 | static int branch_merged(int kind, const char *name, |
110 | struct commit *rev, struct commit *head_rev) | |
111 | { | |
112 | /* | |
113 | * This checks whether the merge bases of branch and HEAD (or | |
114 | * the other branch this branch builds upon) contains the | |
115 | * branch, which means that the branch has already been merged | |
116 | * safely to HEAD (or the other branch). | |
117 | */ | |
118 | struct commit *reference_rev = NULL; | |
119 | const char *reference_name = NULL; | |
96ec7b1e | 120 | void *reference_name_to_free = NULL; |
99c419c9 JH |
121 | int merged; |
122 | ||
123 | if (kind == REF_LOCAL_BRANCH) { | |
124 | struct branch *branch = branch_get(name); | |
125 | unsigned char sha1[20]; | |
126 | ||
127 | if (branch && | |
128 | branch->merge && | |
129 | branch->merge[0] && | |
130 | branch->merge[0]->dst && | |
96ec7b1e NTND |
131 | (reference_name = reference_name_to_free = |
132 | resolve_refdup(branch->merge[0]->dst, sha1, 1, NULL)) != NULL) | |
99c419c9 JH |
133 | reference_rev = lookup_commit_reference(sha1); |
134 | } | |
135 | if (!reference_rev) | |
136 | reference_rev = head_rev; | |
137 | ||
a20efee9 | 138 | merged = in_merge_bases(rev, reference_rev); |
99c419c9 JH |
139 | |
140 | /* | |
141 | * After the safety valve is fully redefined to "check with | |
142 | * upstream, if any, otherwise with HEAD", we should just | |
143 | * return the result of the in_merge_bases() above without | |
144 | * any of the following code, but during the transition period, | |
145 | * a gentle reminder is in order. | |
146 | */ | |
147 | if ((head_rev != reference_rev) && | |
a20efee9 | 148 | in_merge_bases(rev, head_rev) != merged) { |
99c419c9 | 149 | if (merged) |
49df4b02 | 150 | warning(_("deleting branch '%s' that has been merged to\n" |
6c80cd29 | 151 | " '%s', but not yet merged to HEAD."), |
99c419c9 JH |
152 | name, reference_name); |
153 | else | |
49df4b02 ÆAB |
154 | warning(_("not deleting branch '%s' that is not yet merged to\n" |
155 | " '%s', even though it is merged to HEAD."), | |
99c419c9 JH |
156 | name, reference_name); |
157 | } | |
96ec7b1e | 158 | free(reference_name_to_free); |
99c419c9 JH |
159 | return merged; |
160 | } | |
161 | ||
f5d0e162 RS |
162 | static int check_branch_commit(const char *branchname, const char *refname, |
163 | unsigned char *sha1, struct commit *head_rev, | |
164 | int kinds, int force) | |
165 | { | |
166 | struct commit *rev = lookup_commit_reference(sha1); | |
167 | if (!rev) { | |
168 | error(_("Couldn't look up commit object for '%s'"), refname); | |
169 | return -1; | |
170 | } | |
171 | if (!force && !branch_merged(kinds, branchname, rev, head_rev)) { | |
172 | error(_("The branch '%s' is not fully merged.\n" | |
173 | "If you are sure you want to delete it, " | |
174 | "run 'git branch -D %s'."), branchname, branchname); | |
175 | return -1; | |
176 | } | |
177 | return 0; | |
178 | } | |
179 | ||
22ed7927 RS |
180 | static void delete_branch_config(const char *branchname) |
181 | { | |
182 | struct strbuf buf = STRBUF_INIT; | |
183 | strbuf_addf(&buf, "branch.%s", branchname); | |
184 | if (git_config_rename_section(buf.buf, NULL) < 0) | |
185 | warning(_("Update of config-file failed")); | |
186 | strbuf_release(&buf); | |
187 | } | |
188 | ||
d65ddf19 JK |
189 | static int delete_branches(int argc, const char **argv, int force, int kinds, |
190 | int quiet) | |
c31820c2 | 191 | { |
f5d0e162 | 192 | struct commit *head_rev = NULL; |
c31820c2 | 193 | unsigned char sha1[20]; |
b8e9a00d | 194 | char *name = NULL; |
c179837c | 195 | const char *fmt; |
c31820c2 | 196 | int i; |
b8e9a00d | 197 | int ret = 0; |
c179837c | 198 | int remote_branch = 0; |
8415d5c7 | 199 | struct strbuf bname = STRBUF_INIT; |
c31820c2 | 200 | |
f3d985c3 JH |
201 | switch (kinds) { |
202 | case REF_REMOTE_BRANCH: | |
203 | fmt = "refs/remotes/%s"; | |
c179837c ÆAB |
204 | /* For subsequent UI messages */ |
205 | remote_branch = 1; | |
206 | ||
f3d985c3 JH |
207 | force = 1; |
208 | break; | |
209 | case REF_LOCAL_BRANCH: | |
210 | fmt = "refs/heads/%s"; | |
f3d985c3 JH |
211 | break; |
212 | default: | |
49df4b02 | 213 | die(_("cannot use -a with -d")); |
f3d985c3 | 214 | } |
c31820c2 | 215 | |
67affd51 JH |
216 | if (!force) { |
217 | head_rev = lookup_commit_reference(head_sha1); | |
218 | if (!head_rev) | |
49df4b02 | 219 | die(_("Couldn't look up commit object for HEAD")); |
67affd51 | 220 | } |
8415d5c7 | 221 | for (i = 0; i < argc; i++, strbuf_release(&bname)) { |
0fe700e3 RS |
222 | const char *target; |
223 | int flags = 0; | |
224 | ||
a552de75 | 225 | strbuf_branchname(&bname, argv[i]); |
8415d5c7 | 226 | if (kinds == REF_LOCAL_BRANCH && !strcmp(head, bname.buf)) { |
49df4b02 ÆAB |
227 | error(_("Cannot delete the branch '%s' " |
228 | "which you are currently on."), bname.buf); | |
b8e9a00d QT |
229 | ret = 1; |
230 | continue; | |
231 | } | |
232 | ||
8e0f7003 | 233 | free(name); |
c31820c2 | 234 | |
4e2d094d | 235 | name = mkpathdup(fmt, bname.buf); |
0fe700e3 RS |
236 | target = resolve_ref_unsafe(name, sha1, 0, &flags); |
237 | if (!target || | |
238 | (!(flags & REF_ISSYMREF) && is_null_sha1(sha1))) { | |
c179837c ÆAB |
239 | error(remote_branch |
240 | ? _("remote branch '%s' not found.") | |
241 | : _("branch '%s' not found."), bname.buf); | |
b8e9a00d QT |
242 | ret = 1; |
243 | continue; | |
244 | } | |
c31820c2 | 245 | |
0fe700e3 RS |
246 | if (!(flags & REF_ISSYMREF) && |
247 | check_branch_commit(bname.buf, name, sha1, head_rev, kinds, | |
f5d0e162 | 248 | force)) { |
b8e9a00d QT |
249 | ret = 1; |
250 | continue; | |
c31820c2 LH |
251 | } |
252 | ||
566c7707 | 253 | if (delete_ref(name, sha1, REF_NODEREF)) { |
c179837c ÆAB |
254 | error(remote_branch |
255 | ? _("Error deleting remote branch '%s'") | |
256 | : _("Error deleting branch '%s'"), | |
8415d5c7 | 257 | bname.buf); |
b8e9a00d | 258 | ret = 1; |
13baa9fe RS |
259 | continue; |
260 | } | |
261 | if (!quiet) { | |
262 | printf(remote_branch | |
263 | ? _("Deleted remote branch %s (was %s).\n") | |
264 | : _("Deleted branch %s (was %s).\n"), | |
265 | bname.buf, | |
266 | (flags & REF_ISSYMREF) | |
267 | ? target | |
268 | : find_unique_abbrev(sha1, DEFAULT_ABBREV)); | |
f1eccbab | 269 | } |
13baa9fe | 270 | delete_branch_config(bname.buf); |
c31820c2 | 271 | } |
c31820c2 | 272 | |
8e0f7003 | 273 | free(name); |
b8e9a00d QT |
274 | |
275 | return(ret); | |
c31820c2 | 276 | } |
c31820c2 | 277 | |
bfcc9214 AP |
278 | struct ref_item { |
279 | char *name; | |
209d336a | 280 | char *dest; |
1452bd64 | 281 | unsigned int kind, width; |
68067ca1 | 282 | struct commit *commit; |
bfcc9214 AP |
283 | }; |
284 | ||
285 | struct ref_list { | |
68067ca1 | 286 | struct rev_info revs; |
7e9ff00b | 287 | int index, alloc, maxwidth, verbose, abbrev; |
bfcc9214 | 288 | struct ref_item *list; |
694a5775 | 289 | struct commit_list *with_commit; |
bfcc9214 AP |
290 | int kinds; |
291 | }; | |
292 | ||
209d336a JS |
293 | static char *resolve_symref(const char *src, const char *prefix) |
294 | { | |
295 | unsigned char sha1[20]; | |
296 | int flag; | |
297 | const char *dst, *cp; | |
298 | ||
8cad4744 | 299 | dst = resolve_ref_unsafe(src, sha1, 0, &flag); |
209d336a JS |
300 | if (!(dst && (flag & REF_ISSYMREF))) |
301 | return NULL; | |
302 | if (prefix && (cp = skip_prefix(dst, prefix))) | |
303 | dst = cp; | |
304 | return xstrdup(dst); | |
305 | } | |
306 | ||
1603ade8 SM |
307 | struct append_ref_cb { |
308 | struct ref_list *ref_list; | |
d8d33736 | 309 | const char **pattern; |
1603ade8 SM |
310 | int ret; |
311 | }; | |
312 | ||
d8d33736 MG |
313 | static int match_patterns(const char **pattern, const char *refname) |
314 | { | |
315 | if (!*pattern) | |
316 | return 1; /* no pattern always matches */ | |
317 | while (*pattern) { | |
eb07894f | 318 | if (!wildmatch(*pattern, refname, 0, NULL)) |
d8d33736 MG |
319 | return 1; |
320 | pattern++; | |
321 | } | |
322 | return 0; | |
323 | } | |
324 | ||
bfcc9214 | 325 | static int append_ref(const char *refname, const unsigned char *sha1, int flags, void *cb_data) |
c31820c2 | 326 | { |
1603ade8 SM |
327 | struct append_ref_cb *cb = (struct append_ref_cb *)(cb_data); |
328 | struct ref_list *ref_list = cb->ref_list; | |
bfcc9214 | 329 | struct ref_item *newitem; |
68067ca1 | 330 | struct commit *commit; |
209d336a JS |
331 | int kind, i; |
332 | const char *prefix, *orig_refname = refname; | |
333 | ||
334 | static struct { | |
335 | int kind; | |
336 | const char *prefix; | |
337 | int pfxlen; | |
338 | } ref_kind[] = { | |
339 | { REF_LOCAL_BRANCH, "refs/heads/", 11 }, | |
340 | { REF_REMOTE_BRANCH, "refs/remotes/", 13 }, | |
341 | }; | |
bfcc9214 AP |
342 | |
343 | /* Detect kind */ | |
209d336a JS |
344 | for (i = 0; i < ARRAY_SIZE(ref_kind); i++) { |
345 | prefix = ref_kind[i].prefix; | |
346 | if (strncmp(refname, prefix, ref_kind[i].pfxlen)) | |
347 | continue; | |
348 | kind = ref_kind[i].kind; | |
349 | refname += ref_kind[i].pfxlen; | |
350 | break; | |
351 | } | |
352 | if (ARRAY_SIZE(ref_kind) <= i) | |
0f31d680 | 353 | return 0; |
bfcc9214 AP |
354 | |
355 | /* Don't add types the caller doesn't want */ | |
356 | if ((kind & ref_list->kinds) == 0) | |
357 | return 0; | |
358 | ||
d8d33736 MG |
359 | if (!match_patterns(cb->pattern, refname)) |
360 | return 0; | |
361 | ||
191d1ac4 LT |
362 | commit = NULL; |
363 | if (ref_list->verbose || ref_list->with_commit || merge_filter != NO_FILTER) { | |
364 | commit = lookup_commit_reference_gently(sha1, 1); | |
1603ade8 | 365 | if (!commit) { |
49df4b02 | 366 | cb->ret = error(_("branch '%s' does not point at a commit"), refname); |
0e9716e6 | 367 | return 0; |
1603ade8 | 368 | } |
68067ca1 | 369 | |
191d1ac4 LT |
370 | /* Filter with with_commit if specified */ |
371 | if (!is_descendant_of(commit, ref_list->with_commit)) | |
372 | return 0; | |
694a5775 | 373 | |
191d1ac4 LT |
374 | if (merge_filter != NO_FILTER) |
375 | add_pending_object(&ref_list->revs, | |
376 | (struct object *)commit, refname); | |
377 | } | |
e8b404c2 | 378 | |
fcbc0d8e | 379 | ALLOC_GROW(ref_list->list, ref_list->index + 1, ref_list->alloc); |
c31820c2 | 380 | |
bfcc9214 AP |
381 | /* Record the new item */ |
382 | newitem = &(ref_list->list[ref_list->index++]); | |
383 | newitem->name = xstrdup(refname); | |
384 | newitem->kind = kind; | |
68067ca1 | 385 | newitem->commit = commit; |
1452bd64 | 386 | newitem->width = utf8_strwidth(refname); |
209d336a JS |
387 | newitem->dest = resolve_symref(orig_refname, prefix); |
388 | /* adjust for "remotes/" */ | |
389 | if (newitem->kind == REF_REMOTE_BRANCH && | |
390 | ref_list->kinds != REF_REMOTE_BRANCH) | |
1452bd64 NTND |
391 | newitem->width += 8; |
392 | if (newitem->width > ref_list->maxwidth) | |
393 | ref_list->maxwidth = newitem->width; | |
c31820c2 LH |
394 | |
395 | return 0; | |
396 | } | |
397 | ||
bfcc9214 AP |
398 | static void free_ref_list(struct ref_list *ref_list) |
399 | { | |
400 | int i; | |
401 | ||
209d336a | 402 | for (i = 0; i < ref_list->index; i++) { |
bfcc9214 | 403 | free(ref_list->list[i].name); |
209d336a JS |
404 | free(ref_list->list[i].dest); |
405 | } | |
bfcc9214 AP |
406 | free(ref_list->list); |
407 | } | |
408 | ||
c31820c2 LH |
409 | static int ref_cmp(const void *r1, const void *r2) |
410 | { | |
bfcc9214 AP |
411 | struct ref_item *c1 = (struct ref_item *)(r1); |
412 | struct ref_item *c2 = (struct ref_item *)(r2); | |
413 | ||
414 | if (c1->kind != c2->kind) | |
415 | return c1->kind - c2->kind; | |
416 | return strcmp(c1->name, c2->name); | |
c31820c2 LH |
417 | } |
418 | ||
2d8a7f0b JK |
419 | static void fill_tracking_info(struct strbuf *stat, const char *branch_name, |
420 | int show_upstream_ref) | |
94fcb730 JH |
421 | { |
422 | int ours, theirs; | |
21dfc09d | 423 | char *ref = NULL; |
94fcb730 | 424 | struct branch *branch = branch_get(branch_name); |
dbda21fa | 425 | struct strbuf fancy = STRBUF_INIT; |
f2e08739 | 426 | int upstream_is_gone = 0; |
6b364d48 | 427 | int added_decoration = 1; |
94fcb730 | 428 | |
f2e08739 JX |
429 | switch (stat_tracking_info(branch, &ours, &theirs)) { |
430 | case 0: | |
431 | /* no base */ | |
94fcb730 | 432 | return; |
f2e08739 JX |
433 | case -1: |
434 | /* with "gone" base */ | |
435 | upstream_is_gone = 1; | |
436 | break; | |
437 | default: | |
438 | /* with base */ | |
439 | break; | |
2d8a7f0b JK |
440 | } |
441 | ||
dbda21fa | 442 | if (show_upstream_ref) { |
21dfc09d | 443 | ref = shorten_unambiguous_ref(branch->merge[0]->dst, 0); |
dbda21fa FC |
444 | if (want_color(branch_use_color)) |
445 | strbuf_addf(&fancy, "%s%s%s", | |
446 | branch_get_color(BRANCH_COLOR_UPSTREAM), | |
447 | ref, branch_get_color(BRANCH_COLOR_RESET)); | |
448 | else | |
449 | strbuf_addstr(&fancy, ref); | |
450 | } | |
451 | ||
f2e08739 JX |
452 | if (upstream_is_gone) { |
453 | if (show_upstream_ref) | |
454 | strbuf_addf(stat, _("[%s: gone]"), fancy.buf); | |
6b364d48 TH |
455 | else |
456 | added_decoration = 0; | |
f2e08739 JX |
457 | } else if (!ours && !theirs) { |
458 | if (show_upstream_ref) | |
459 | strbuf_addf(stat, _("[%s]"), fancy.buf); | |
6b364d48 TH |
460 | else |
461 | added_decoration = 0; | |
f2e08739 JX |
462 | } else if (!ours) { |
463 | if (show_upstream_ref) | |
dbda21fa | 464 | strbuf_addf(stat, _("[%s: behind %d]"), fancy.buf, theirs); |
21dfc09d NTND |
465 | else |
466 | strbuf_addf(stat, _("[behind %d]"), theirs); | |
467 | ||
468 | } else if (!theirs) { | |
f2e08739 | 469 | if (show_upstream_ref) |
dbda21fa | 470 | strbuf_addf(stat, _("[%s: ahead %d]"), fancy.buf, ours); |
21dfc09d NTND |
471 | else |
472 | strbuf_addf(stat, _("[ahead %d]"), ours); | |
473 | } else { | |
f2e08739 | 474 | if (show_upstream_ref) |
21dfc09d | 475 | strbuf_addf(stat, _("[%s: ahead %d, behind %d]"), |
dbda21fa | 476 | fancy.buf, ours, theirs); |
21dfc09d NTND |
477 | else |
478 | strbuf_addf(stat, _("[ahead %d, behind %d]"), | |
479 | ours, theirs); | |
480 | } | |
dbda21fa | 481 | strbuf_release(&fancy); |
6b364d48 TH |
482 | if (added_decoration) |
483 | strbuf_addch(stat, ' '); | |
21dfc09d | 484 | free(ref); |
94fcb730 JH |
485 | } |
486 | ||
7950cda7 LH |
487 | static int matches_merge_filter(struct commit *commit) |
488 | { | |
489 | int is_merged; | |
490 | ||
491 | if (merge_filter == NO_FILTER) | |
492 | return 1; | |
493 | ||
494 | is_merged = !!(commit->object.flags & UNINTERESTING); | |
495 | return (is_merged == (merge_filter == SHOW_MERGED)); | |
496 | } | |
497 | ||
6e0332ec JN |
498 | static void add_verbose_info(struct strbuf *out, struct ref_item *item, |
499 | int verbose, int abbrev) | |
500 | { | |
501 | struct strbuf subject = STRBUF_INIT, stat = STRBUF_INIT; | |
045e3884 | 502 | const char *sub = _(" **** invalid ref ****"); |
6e0332ec JN |
503 | struct commit *commit = item->commit; |
504 | ||
5e7d4d3e | 505 | if (!parse_commit(commit)) { |
f67d2e82 | 506 | pp_commit_easy(CMIT_FMT_ONELINE, commit, &subject); |
6e0332ec JN |
507 | sub = subject.buf; |
508 | } | |
509 | ||
510 | if (item->kind == REF_LOCAL_BRANCH) | |
511 | fill_tracking_info(&stat, item->name, verbose > 1); | |
512 | ||
513 | strbuf_addf(out, " %s %s%s", | |
514 | find_unique_abbrev(item->commit->object.sha1, abbrev), | |
515 | stat.buf, sub); | |
516 | strbuf_release(&stat); | |
517 | strbuf_release(&subject); | |
518 | } | |
519 | ||
af0e4ac0 | 520 | static void print_ref_item(struct ref_item *item, int maxwidth, int verbose, |
209d336a | 521 | int abbrev, int current, char *prefix) |
75e6e213 | 522 | { |
af0e4ac0 LH |
523 | char c; |
524 | int color; | |
68067ca1 | 525 | struct commit *commit = item->commit; |
209d336a | 526 | struct strbuf out = STRBUF_INIT, name = STRBUF_INIT; |
68067ca1 | 527 | |
7950cda7 LH |
528 | if (!matches_merge_filter(commit)) |
529 | return; | |
75e6e213 | 530 | |
af0e4ac0 LH |
531 | switch (item->kind) { |
532 | case REF_LOCAL_BRANCH: | |
74bb2dfb | 533 | color = BRANCH_COLOR_LOCAL; |
af0e4ac0 LH |
534 | break; |
535 | case REF_REMOTE_BRANCH: | |
74bb2dfb | 536 | color = BRANCH_COLOR_REMOTE; |
af0e4ac0 LH |
537 | break; |
538 | default: | |
74bb2dfb | 539 | color = BRANCH_COLOR_PLAIN; |
af0e4ac0 LH |
540 | break; |
541 | } | |
75e6e213 | 542 | |
af0e4ac0 LH |
543 | c = ' '; |
544 | if (current) { | |
545 | c = '*'; | |
74bb2dfb | 546 | color = BRANCH_COLOR_CURRENT; |
af0e4ac0 | 547 | } |
75e6e213 | 548 | |
209d336a | 549 | strbuf_addf(&name, "%s%s", prefix, item->name); |
1452bd64 NTND |
550 | if (verbose) { |
551 | int utf8_compensation = strlen(name.buf) - utf8_strwidth(name.buf); | |
209d336a | 552 | strbuf_addf(&out, "%c %s%-*s%s", c, branch_get_color(color), |
1452bd64 | 553 | maxwidth + utf8_compensation, name.buf, |
81474267 | 554 | branch_get_color(BRANCH_COLOR_RESET)); |
1452bd64 | 555 | } else |
209d336a | 556 | strbuf_addf(&out, "%c %s%s%s", c, branch_get_color(color), |
81474267 | 557 | name.buf, branch_get_color(BRANCH_COLOR_RESET)); |
209d336a JS |
558 | |
559 | if (item->dest) | |
560 | strbuf_addf(&out, " -> %s", item->dest); | |
6e0332ec JN |
561 | else if (verbose) |
562 | /* " f7c0c00 [ahead 58, behind 197] vcs-svn: drop obj_pool.h" */ | |
563 | add_verbose_info(&out, item, verbose, abbrev); | |
ebe31ef2 NTND |
564 | if (column_active(colopts)) { |
565 | assert(!verbose && "--column and --verbose are incompatible"); | |
566 | string_list_append(&output, out.buf); | |
567 | } else { | |
568 | printf("%s\n", out.buf); | |
569 | } | |
209d336a JS |
570 | strbuf_release(&name); |
571 | strbuf_release(&out); | |
75e6e213 LH |
572 | } |
573 | ||
b6f637d1 LH |
574 | static int calc_maxwidth(struct ref_list *refs) |
575 | { | |
209d336a | 576 | int i, w = 0; |
b6f637d1 LH |
577 | for (i = 0; i < refs->index; i++) { |
578 | if (!matches_merge_filter(refs->list[i].commit)) | |
579 | continue; | |
1452bd64 NTND |
580 | if (refs->list[i].width > w) |
581 | w = refs->list[i].width; | |
b6f637d1 LH |
582 | } |
583 | return w; | |
584 | } | |
585 | ||
c8183cd2 NTND |
586 | static char *get_head_description(void) |
587 | { | |
588 | struct strbuf desc = STRBUF_INIT; | |
589 | struct wt_status_state state; | |
590 | memset(&state, 0, sizeof(state)); | |
591 | wt_status_get_state(&state, 1); | |
592 | if (state.rebase_in_progress || | |
593 | state.rebase_interactive_in_progress) | |
594 | strbuf_addf(&desc, _("(no branch, rebasing %s)"), | |
595 | state.branch); | |
596 | else if (state.bisect_in_progress) | |
6deab24d | 597 | strbuf_addf(&desc, _("(no branch, bisect started on %s)"), |
c8183cd2 NTND |
598 | state.branch); |
599 | else if (state.detached_from) | |
600 | strbuf_addf(&desc, _("(detached from %s)"), | |
601 | state.detached_from); | |
602 | else | |
603 | strbuf_addstr(&desc, _("(no branch)")); | |
604 | free(state.branch); | |
605 | free(state.onto); | |
606 | free(state.detached_from); | |
607 | return strbuf_detach(&desc, NULL); | |
608 | } | |
7e9ff00b LT |
609 | |
610 | static void show_detached(struct ref_list *ref_list) | |
611 | { | |
612 | struct commit *head_commit = lookup_commit_reference_gently(head_sha1, 1); | |
613 | ||
614 | if (head_commit && is_descendant_of(head_commit, ref_list->with_commit)) { | |
615 | struct ref_item item; | |
c8183cd2 | 616 | item.name = get_head_description(); |
1452bd64 | 617 | item.width = utf8_strwidth(item.name); |
7e9ff00b LT |
618 | item.kind = REF_LOCAL_BRANCH; |
619 | item.dest = NULL; | |
620 | item.commit = head_commit; | |
1452bd64 NTND |
621 | if (item.width > ref_list->maxwidth) |
622 | ref_list->maxwidth = item.width; | |
7e9ff00b LT |
623 | print_ref_item(&item, ref_list->maxwidth, ref_list->verbose, ref_list->abbrev, 1, ""); |
624 | free(item.name); | |
625 | } | |
626 | } | |
627 | ||
d8d33736 | 628 | static int print_ref_list(int kinds, int detached, int verbose, int abbrev, struct commit_list *with_commit, const char **pattern) |
c31820c2 LH |
629 | { |
630 | int i; | |
1603ade8 | 631 | struct append_ref_cb cb; |
bfcc9214 | 632 | struct ref_list ref_list; |
c31820c2 | 633 | |
bfcc9214 AP |
634 | memset(&ref_list, 0, sizeof(ref_list)); |
635 | ref_list.kinds = kinds; | |
191d1ac4 | 636 | ref_list.verbose = verbose; |
7e9ff00b | 637 | ref_list.abbrev = abbrev; |
694a5775 | 638 | ref_list.with_commit = with_commit; |
68067ca1 JH |
639 | if (merge_filter != NO_FILTER) |
640 | init_revisions(&ref_list.revs, NULL); | |
1603ade8 | 641 | cb.ref_list = &ref_list; |
d8d33736 | 642 | cb.pattern = pattern; |
1603ade8 SM |
643 | cb.ret = 0; |
644 | for_each_rawref(append_ref, &cb); | |
68067ca1 JH |
645 | if (merge_filter != NO_FILTER) { |
646 | struct commit *filter; | |
647 | filter = lookup_commit_reference_gently(merge_filter_ref, 0); | |
6c41e975 | 648 | if (!filter) |
045e3884 | 649 | die(_("object '%s' does not point to a commit"), |
6c41e975 CMN |
650 | sha1_to_hex(merge_filter_ref)); |
651 | ||
68067ca1 JH |
652 | filter->object.flags |= UNINTERESTING; |
653 | add_pending_object(&ref_list.revs, | |
654 | (struct object *) filter, ""); | |
655 | ref_list.revs.limited = 1; | |
656 | prepare_revision_walk(&ref_list.revs); | |
b6f637d1 LH |
657 | if (verbose) |
658 | ref_list.maxwidth = calc_maxwidth(&ref_list); | |
68067ca1 | 659 | } |
c31820c2 | 660 | |
bfcc9214 | 661 | qsort(ref_list.list, ref_list.index, sizeof(struct ref_item), ref_cmp); |
c31820c2 | 662 | |
0016a482 | 663 | detached = (detached && (kinds & REF_LOCAL_BRANCH)); |
d8d33736 | 664 | if (detached && match_patterns(pattern, "HEAD")) |
7e9ff00b | 665 | show_detached(&ref_list); |
0016a482 | 666 | |
bfcc9214 | 667 | for (i = 0; i < ref_list.index; i++) { |
0016a482 LH |
668 | int current = !detached && |
669 | (ref_list.list[i].kind == REF_LOCAL_BRANCH) && | |
af0e4ac0 | 670 | !strcmp(ref_list.list[i].name, head); |
209d336a JS |
671 | char *prefix = (kinds != REF_REMOTE_BRANCH && |
672 | ref_list.list[i].kind == REF_REMOTE_BRANCH) | |
673 | ? "remotes/" : ""; | |
af0e4ac0 | 674 | print_ref_item(&ref_list.list[i], ref_list.maxwidth, verbose, |
209d336a | 675 | abbrev, current, prefix); |
c31820c2 | 676 | } |
bfcc9214 AP |
677 | |
678 | free_ref_list(&ref_list); | |
1603ade8 | 679 | |
0e9716e6 | 680 | if (cb.ret) |
49df4b02 | 681 | error(_("some refs could not be read")); |
0e9716e6 | 682 | |
1603ade8 | 683 | return cb.ret; |
c31820c2 LH |
684 | } |
685 | ||
c976d415 LH |
686 | static void rename_branch(const char *oldname, const char *newname, int force) |
687 | { | |
da3f78a2 | 688 | struct strbuf oldref = STRBUF_INIT, newref = STRBUF_INIT, logmsg = STRBUF_INIT; |
da3f78a2 | 689 | struct strbuf oldsection = STRBUF_INIT, newsection = STRBUF_INIT; |
cbdffe40 | 690 | int recovery = 0; |
3f59481e | 691 | int clobber_head_ok; |
c976d415 | 692 | |
c847f537 | 693 | if (!oldname) |
49df4b02 | 694 | die(_("cannot rename the current branch while not on any.")); |
c847f537 | 695 | |
cbdffe40 JH |
696 | if (strbuf_check_branch_ref(&oldref, oldname)) { |
697 | /* | |
698 | * Bad name --- this could be an attempt to rename a | |
699 | * ref that we used to allow to be created by accident. | |
700 | */ | |
c6893323 | 701 | if (ref_exists(oldref.buf)) |
cbdffe40 JH |
702 | recovery = 1; |
703 | else | |
49df4b02 | 704 | die(_("Invalid branch name: '%s'"), oldname); |
cbdffe40 | 705 | } |
c976d415 | 706 | |
3f59481e JN |
707 | /* |
708 | * A command like "git branch -M currentbranch currentbranch" cannot | |
709 | * cause the worktree to become inconsistent with HEAD, so allow it. | |
710 | */ | |
711 | clobber_head_ok = !strcmp(oldname, newname); | |
712 | ||
713 | validate_new_branchname(newname, &newref, force, clobber_head_ok); | |
c976d415 | 714 | |
da3f78a2 MV |
715 | strbuf_addf(&logmsg, "Branch: renamed %s to %s", |
716 | oldref.buf, newref.buf); | |
678d0f4c | 717 | |
da3f78a2 | 718 | if (rename_ref(oldref.buf, newref.buf, logmsg.buf)) |
49df4b02 | 719 | die(_("Branch rename failed")); |
da3f78a2 | 720 | strbuf_release(&logmsg); |
c976d415 | 721 | |
cbdffe40 | 722 | if (recovery) |
49df4b02 | 723 | warning(_("Renamed a misnamed branch '%s' away"), oldref.buf + 11); |
cbdffe40 | 724 | |
8b5157e4 | 725 | /* no need to pass logmsg here as HEAD didn't really move */ |
da3f78a2 | 726 | if (!strcmp(oldname, head) && create_symref("HEAD", newref.buf, NULL)) |
49df4b02 | 727 | die(_("Branch renamed to %s, but HEAD is not updated!"), newname); |
19eba151 | 728 | |
da3f78a2 MV |
729 | strbuf_addf(&oldsection, "branch.%s", oldref.buf + 11); |
730 | strbuf_release(&oldref); | |
731 | strbuf_addf(&newsection, "branch.%s", newref.buf + 11); | |
732 | strbuf_release(&newref); | |
733 | if (git_config_rename_section(oldsection.buf, newsection.buf) < 0) | |
49df4b02 | 734 | die(_("Branch is renamed, but update of config-file failed")); |
da3f78a2 MV |
735 | strbuf_release(&oldsection); |
736 | strbuf_release(&newsection); | |
c976d415 LH |
737 | } |
738 | ||
049716b3 JH |
739 | static int opt_parse_merge_filter(const struct option *opt, const char *arg, int unset) |
740 | { | |
741 | merge_filter = ((opt->long_name[0] == 'n') | |
742 | ? SHOW_NOT_MERGED | |
743 | : SHOW_MERGED); | |
744 | if (unset) | |
745 | merge_filter = SHOW_NOT_MERGED; /* b/c for --no-merged */ | |
746 | if (!arg) | |
747 | arg = "HEAD"; | |
748 | if (get_sha1(arg, merge_filter_ref)) | |
49df4b02 | 749 | die(_("malformed object name %s"), arg); |
049716b3 JH |
750 | return 0; |
751 | } | |
752 | ||
b7200e83 JH |
753 | static const char edit_description[] = "BRANCH_DESCRIPTION"; |
754 | ||
755 | static int edit_branch_description(const char *branch_name) | |
756 | { | |
757 | FILE *fp; | |
758 | int status; | |
759 | struct strbuf buf = STRBUF_INIT; | |
760 | struct strbuf name = STRBUF_INIT; | |
761 | ||
762 | read_branch_desc(&buf, branch_name); | |
763 | if (!buf.len || buf.buf[buf.len-1] != '\n') | |
764 | strbuf_addch(&buf, '\n'); | |
eff80a9f JH |
765 | strbuf_commented_addf(&buf, |
766 | "Please edit the description for the branch\n" | |
767 | " %s\n" | |
768 | "Lines starting with '%c' will be stripped.\n", | |
769 | branch_name, comment_line_char); | |
b7200e83 JH |
770 | fp = fopen(git_path(edit_description), "w"); |
771 | if ((fwrite(buf.buf, 1, buf.len, fp) < buf.len) || fclose(fp)) { | |
772 | strbuf_release(&buf); | |
82247e9b | 773 | return error(_("could not write branch description template: %s"), |
b7200e83 JH |
774 | strerror(errno)); |
775 | } | |
776 | strbuf_reset(&buf); | |
777 | if (launch_editor(git_path(edit_description), &buf, NULL)) { | |
778 | strbuf_release(&buf); | |
779 | return -1; | |
780 | } | |
781 | stripspace(&buf, 1); | |
782 | ||
783 | strbuf_addf(&name, "branch.%s.description", branch_name); | |
4b5553b5 | 784 | status = git_config_set(name.buf, buf.len ? buf.buf : NULL); |
b7200e83 JH |
785 | strbuf_release(&name); |
786 | strbuf_release(&buf); | |
787 | ||
788 | return status; | |
789 | } | |
790 | ||
c31820c2 LH |
791 | int cmd_branch(int argc, const char **argv, const char *prefix) |
792 | { | |
cddd127b | 793 | int delete = 0, rename = 0, force_create = 0, list = 0; |
b792c067 | 794 | int verbose = 0, abbrev = -1, detached = 0; |
b7200e83 | 795 | int reflog = 0, edit_description = 0; |
b84869ef | 796 | int quiet = 0, unset_upstream = 0; |
6183d826 | 797 | const char *new_upstream = NULL; |
9ed36cfa | 798 | enum branch_track track; |
d11d44fa | 799 | int kinds = REF_LOCAL_BRANCH; |
694a5775 | 800 | struct commit_list *with_commit = NULL; |
a8dfd5ea PH |
801 | |
802 | struct option options[] = { | |
24a85214 | 803 | OPT_GROUP(N_("Generic options")), |
39271425 | 804 | OPT__VERBOSE(&verbose, |
24a85214 NTND |
805 | N_("show hash and subject, give twice for upstream branch")), |
806 | OPT__QUIET(&quiet, N_("suppress informational messages")), | |
807 | OPT_SET_INT('t', "track", &track, N_("set up tracking mode (see git-pull(1))"), | |
9ed36cfa | 808 | BRANCH_TRACK_EXPLICIT), |
24a85214 | 809 | OPT_SET_INT( 0, "set-upstream", &track, N_("change upstream info"), |
4fc50066 | 810 | BRANCH_TRACK_OVERRIDE), |
6183d826 | 811 | OPT_STRING('u', "set-upstream-to", &new_upstream, "upstream", "change the upstream info"), |
d5d09d47 | 812 | OPT_BOOL(0, "unset-upstream", &unset_upstream, "Unset the upstream info"), |
24a85214 NTND |
813 | OPT__COLOR(&branch_use_color, N_("use colored output")), |
814 | OPT_SET_INT('r', "remotes", &kinds, N_("act on remote-tracking branches"), | |
d11d44fa | 815 | REF_REMOTE_BRANCH), |
e84fb2ff | 816 | { |
24a85214 NTND |
817 | OPTION_CALLBACK, 0, "contains", &with_commit, N_("commit"), |
818 | N_("print only branches that contain the commit"), | |
e84fb2ff | 819 | PARSE_OPT_LASTARG_DEFAULT, |
269defdf | 820 | parse_opt_with_commit, (intptr_t)"HEAD", |
e84fb2ff | 821 | }, |
694a5775 | 822 | { |
24a85214 NTND |
823 | OPTION_CALLBACK, 0, "with", &with_commit, N_("commit"), |
824 | N_("print only branches that contain the commit"), | |
e84fb2ff | 825 | PARSE_OPT_HIDDEN | PARSE_OPT_LASTARG_DEFAULT, |
269defdf | 826 | parse_opt_with_commit, (intptr_t) "HEAD", |
694a5775 | 827 | }, |
a8dfd5ea PH |
828 | OPT__ABBREV(&abbrev), |
829 | ||
24a85214 NTND |
830 | OPT_GROUP(N_("Specific git-branch actions:")), |
831 | OPT_SET_INT('a', "all", &kinds, N_("list both remote-tracking and local branches"), | |
d11d44fa | 832 | REF_REMOTE_BRANCH | REF_LOCAL_BRANCH), |
24a85214 NTND |
833 | OPT_BIT('d', "delete", &delete, N_("delete fully merged branch"), 1), |
834 | OPT_BIT('D', NULL, &delete, N_("delete branch (even if not merged)"), 2), | |
835 | OPT_BIT('m', "move", &rename, N_("move/rename a branch and its reflog"), 1), | |
836 | OPT_BIT('M', NULL, &rename, N_("move/rename a branch, even if target exists"), 2), | |
d5d09d47 SB |
837 | OPT_BOOL(0, "list", &list, N_("list branch names")), |
838 | OPT_BOOL('l', "create-reflog", &reflog, N_("create the branch's reflog")), | |
839 | OPT_BOOL(0, "edit-description", &edit_description, | |
840 | N_("edit the description for the branch")), | |
24a85214 | 841 | OPT__FORCE(&force_create, N_("force creation (when already exists)")), |
049716b3 JH |
842 | { |
843 | OPTION_CALLBACK, 0, "no-merged", &merge_filter_ref, | |
24a85214 | 844 | N_("commit"), N_("print only not merged branches"), |
049716b3 JH |
845 | PARSE_OPT_LASTARG_DEFAULT | PARSE_OPT_NONEG, |
846 | opt_parse_merge_filter, (intptr_t) "HEAD", | |
847 | }, | |
848 | { | |
849 | OPTION_CALLBACK, 0, "merged", &merge_filter_ref, | |
24a85214 | 850 | N_("commit"), N_("print only merged branches"), |
049716b3 JH |
851 | PARSE_OPT_LASTARG_DEFAULT | PARSE_OPT_NONEG, |
852 | opt_parse_merge_filter, (intptr_t) "HEAD", | |
853 | }, | |
24a85214 | 854 | OPT_COLUMN(0, "column", &colopts, N_("list branches in columns")), |
a8dfd5ea PH |
855 | OPT_END(), |
856 | }; | |
c31820c2 | 857 | |
1dacfbcf NTND |
858 | if (argc == 2 && !strcmp(argv[1], "-h")) |
859 | usage_with_options(builtin_branch_usage, options); | |
860 | ||
ef90d6d4 | 861 | git_config(git_branch_config, NULL); |
6b2f2d98 | 862 | |
9ed36cfa | 863 | track = git_branch_track; |
c976d415 | 864 | |
96ec7b1e | 865 | head = resolve_refdup("HEAD", head_sha1, 0, NULL); |
c31820c2 | 866 | if (!head) |
49df4b02 | 867 | die(_("Failed to resolve HEAD as a valid ref.")); |
0016a482 LH |
868 | if (!strcmp(head, "HEAD")) { |
869 | detached = 1; | |
a8dfd5ea | 870 | } else { |
59556548 | 871 | if (!starts_with(head, "refs/heads/")) |
49df4b02 | 872 | die(_("HEAD not found below refs/heads!")); |
0016a482 LH |
873 | head += 11; |
874 | } | |
049716b3 JH |
875 | hashcpy(merge_filter_ref, head_sha1); |
876 | ||
ebe31ef2 | 877 | |
37782920 SB |
878 | argc = parse_options(argc, argv, prefix, options, builtin_branch_usage, |
879 | 0); | |
cddd127b | 880 | |
b84869ef | 881 | if (!delete && !rename && !edit_description && !new_upstream && !unset_upstream && argc == 0) |
cddd127b MG |
882 | list = 1; |
883 | ||
d0403508 JK |
884 | if (with_commit || merge_filter != NO_FILTER) |
885 | list = 1; | |
886 | ||
05efb7b7 SB |
887 | if (!!delete + !!rename + !!force_create + !!new_upstream + |
888 | list + unset_upstream > 1) | |
049716b3 | 889 | usage_with_options(builtin_branch_usage, options); |
c31820c2 | 890 | |
b792c067 NK |
891 | if (abbrev == -1) |
892 | abbrev = DEFAULT_ABBREV; | |
ebe31ef2 NTND |
893 | finalize_colopts(&colopts, -1); |
894 | if (verbose) { | |
895 | if (explicitly_enable_column(colopts)) | |
896 | die(_("--column and --verbose are incompatible")); | |
897 | colopts = 0; | |
898 | } | |
b792c067 | 899 | |
640d0401 NTND |
900 | if (delete) { |
901 | if (!argc) | |
902 | die(_("branch name required")); | |
d65ddf19 | 903 | return delete_branches(argc, argv, delete > 1, kinds, quiet); |
640d0401 | 904 | } else if (list) { |
ebe31ef2 NTND |
905 | int ret = print_ref_list(kinds, detached, verbose, abbrev, |
906 | with_commit, argv); | |
907 | print_columns(&output, colopts, NULL); | |
908 | string_list_clear(&output, 0); | |
909 | return ret; | |
910 | } | |
b7200e83 JH |
911 | else if (edit_description) { |
912 | const char *branch_name; | |
c2d17ba3 JH |
913 | struct strbuf branch_ref = STRBUF_INIT; |
914 | ||
75135b23 NTND |
915 | if (!argc) { |
916 | if (detached) | |
045e3884 | 917 | die(_("Cannot give description to detached HEAD")); |
b7200e83 | 918 | branch_name = head; |
75135b23 | 919 | } else if (argc == 1) |
b7200e83 JH |
920 | branch_name = argv[0]; |
921 | else | |
43722c4d | 922 | die(_("cannot edit description of more than one branch")); |
c2d17ba3 JH |
923 | |
924 | strbuf_addf(&branch_ref, "refs/heads/%s", branch_name); | |
925 | if (!ref_exists(branch_ref.buf)) { | |
926 | strbuf_release(&branch_ref); | |
927 | ||
928 | if (!argc) | |
045e3884 | 929 | return error(_("No commit on branch '%s' yet."), |
c2d17ba3 JH |
930 | branch_name); |
931 | else | |
045e3884 NTND |
932 | return error(_("No branch named '%s'."), |
933 | branch_name); | |
c2d17ba3 JH |
934 | } |
935 | strbuf_release(&branch_ref); | |
936 | ||
b7200e83 JH |
937 | if (edit_branch_description(branch_name)) |
938 | return 1; | |
a4043aea | 939 | } else if (rename) { |
d1520c4b JM |
940 | if (!argc) |
941 | die(_("branch name required")); | |
942 | else if (argc == 1) | |
3706ed29 TRC |
943 | rename_branch(head, argv[0], rename > 1); |
944 | else if (argc == 2) | |
945 | rename_branch(argv[0], argv[1], rename > 1); | |
946 | else | |
43722c4d | 947 | die(_("too many branches for a rename operation")); |
6183d826 CMN |
948 | } else if (new_upstream) { |
949 | struct branch *branch = branch_get(argv[0]); | |
950 | ||
8efb8899 NTND |
951 | if (argc > 1) |
952 | die(_("too many branches to set new upstream")); | |
953 | ||
954 | if (!branch) { | |
955 | if (!argc || !strcmp(argv[0], "HEAD")) | |
956 | die(_("could not set upstream of HEAD to %s when " | |
957 | "it does not point to any branch."), | |
958 | new_upstream); | |
959 | die(_("no such branch '%s'"), argv[0]); | |
960 | } | |
961 | ||
6183d826 CMN |
962 | if (!ref_exists(branch->refname)) |
963 | die(_("branch '%s' does not exist"), branch->name); | |
964 | ||
965 | /* | |
966 | * create_branch takes care of setting up the tracking | |
967 | * info and making sure new_upstream is correct | |
968 | */ | |
969 | create_branch(head, branch->name, new_upstream, 0, 0, 0, quiet, BRANCH_TRACK_OVERRIDE); | |
b84869ef CMN |
970 | } else if (unset_upstream) { |
971 | struct branch *branch = branch_get(argv[0]); | |
972 | struct strbuf buf = STRBUF_INIT; | |
973 | ||
8efb8899 NTND |
974 | if (argc > 1) |
975 | die(_("too many branches to unset upstream")); | |
976 | ||
977 | if (!branch) { | |
978 | if (!argc || !strcmp(argv[0], "HEAD")) | |
979 | die(_("could not unset upstream of HEAD when " | |
980 | "it does not point to any branch.")); | |
981 | die(_("no such branch '%s'"), argv[0]); | |
982 | } | |
983 | ||
54d07f2e | 984 | if (!branch_has_merge_config(branch)) |
b84869ef | 985 | die(_("Branch '%s' has no upstream information"), branch->name); |
b84869ef CMN |
986 | |
987 | strbuf_addf(&buf, "branch.%s.remote", branch->name); | |
988 | git_config_set_multivar(buf.buf, NULL, NULL, 1); | |
989 | strbuf_reset(&buf); | |
990 | strbuf_addf(&buf, "branch.%s.merge", branch->name); | |
991 | git_config_set_multivar(buf.buf, NULL, NULL, 1); | |
992 | strbuf_release(&buf); | |
5cd75c7d | 993 | } else if (argc > 0 && argc <= 2) { |
b347d06b CMN |
994 | struct branch *branch = branch_get(argv[0]); |
995 | int branch_existed = 0, remote_tracking = 0; | |
996 | struct strbuf buf = STRBUF_INIT; | |
997 | ||
8efb8899 NTND |
998 | if (!strcmp(argv[0], "HEAD")) |
999 | die(_("it does not make sense to create 'HEAD' manually")); | |
1000 | ||
1001 | if (!branch) | |
1002 | die(_("no such branch '%s'"), argv[0]); | |
1003 | ||
6e8f993a | 1004 | if (kinds != REF_LOCAL_BRANCH) |
49df4b02 | 1005 | die(_("-a and -r options to 'git branch' do not make sense with a branch name")); |
b347d06b CMN |
1006 | |
1007 | if (track == BRANCH_TRACK_OVERRIDE) | |
1008 | fprintf(stderr, _("The --set-upstream flag is deprecated and will be removed. Consider using --track or --set-upstream-to\n")); | |
1009 | ||
1010 | strbuf_addf(&buf, "refs/remotes/%s", branch->name); | |
1011 | remote_tracking = ref_exists(buf.buf); | |
1012 | strbuf_release(&buf); | |
1013 | ||
1014 | branch_existed = ref_exists(branch->refname); | |
e496c003 | 1015 | create_branch(head, argv[0], (argc == 2) ? argv[1] : head, |
d65ddf19 | 1016 | force_create, reflog, 0, quiet, track); |
b347d06b CMN |
1017 | |
1018 | /* | |
1019 | * We only show the instructions if the user gave us | |
1020 | * one branch which doesn't exist locally, but is the | |
1021 | * name of a remote-tracking branch. | |
1022 | */ | |
1023 | if (argc == 1 && track == BRANCH_TRACK_OVERRIDE && | |
1024 | !branch_existed && remote_tracking) { | |
1025 | fprintf(stderr, _("\nIf you wanted to make '%s' track '%s', do this:\n\n"), head, branch->name); | |
1026 | fprintf(stderr, _(" git branch -d %s\n"), branch->name); | |
1027 | fprintf(stderr, _(" git branch --set-upstream-to %s\n"), branch->name); | |
1028 | } | |
1029 | ||
6e8f993a | 1030 | } else |
a8dfd5ea | 1031 | usage_with_options(builtin_branch_usage, options); |
c31820c2 LH |
1032 | |
1033 | return 0; | |
1034 | } |