?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
Merge branch 'rb/nonstop-lacks-uncompress2'
[git/debian.git] / wt-status.c
blob335e723a71e2537095359d3d4ee6cb77daea1e16
1 #include "cache.h"
2 #include "wt-status.h"
3 #include "object.h"
4 #include "dir.h"
5 #include "commit.h"
6 #include "diff.h"
7 #include "revision.h"
8 #include "diffcore.h"
9 #include "quote.h"
10 #include "run-command.h"
11 #include "strvec.h"
12 #include "remote.h"
13 #include "refs.h"
14 #include "submodule.h"
15 #include "column.h"
16 #include "strbuf.h"
17 #include "utf8.h"
18 #include "worktree.h"
19 #include "lockfile.h"
20 #include "sequencer.h"
21
22 #define AB_DELAY_WARNING_IN_MS (2 * 1000)
23
24 static const char cut_line[] =
25 "------------------------ >8 ------------------------\n";
26
27 static char default_wt_status_colors[][COLOR_MAXLEN] = {
28 GIT_COLOR_NORMAL, /* WT_STATUS_HEADER */
29 GIT_COLOR_GREEN, /* WT_STATUS_UPDATED */
30 GIT_COLOR_RED, /* WT_STATUS_CHANGED */
31 GIT_COLOR_RED, /* WT_STATUS_UNTRACKED */
32 GIT_COLOR_RED, /* WT_STATUS_NOBRANCH */
33 GIT_COLOR_RED, /* WT_STATUS_UNMERGED */
34 GIT_COLOR_GREEN, /* WT_STATUS_LOCAL_BRANCH */
35 GIT_COLOR_RED, /* WT_STATUS_REMOTE_BRANCH */
36 GIT_COLOR_NIL, /* WT_STATUS_ONBRANCH */
37 };
38
39 static const char *color(int slot, struct wt_status *s)
40 {
41 const char *c = "";
42 if (want_color(s->use_color))
43 c = s->color_palette[slot];
44 if (slot == WT_STATUS_ONBRANCH && color_is_nil(c))
45 c = s->color_palette[WT_STATUS_HEADER];
46 return c;
47 }
48
49 static void status_vprintf(struct wt_status *s, int at_bol, const char *color,
50 const char *fmt, va_list ap, const char *trail)
51 {
52 struct strbuf sb = STRBUF_INIT;
53 struct strbuf linebuf = STRBUF_INIT;
54 const char *line, *eol;
55
56 strbuf_vaddf(&sb, fmt, ap);
57 if (!sb.len) {
58 if (s->display_comment_prefix) {
59 strbuf_addch(&sb, comment_line_char);
60 if (!trail)
61 strbuf_addch(&sb, ' ');
62 }
63 color_print_strbuf(s->fp, color, &sb);
64 if (trail)
65 fprintf(s->fp, "%s", trail);
66 strbuf_release(&sb);
67 return;
68 }
69 for (line = sb.buf; *line; line = eol + 1) {
70 eol = strchr(line, '\n');
71
72 strbuf_reset(&linebuf);
73 if (at_bol && s->display_comment_prefix) {
74 strbuf_addch(&linebuf, comment_line_char);
75 if (*line != '\n' && *line != '\t')
76 strbuf_addch(&linebuf, ' ');
77 }
78 if (eol)
79 strbuf_add(&linebuf, line, eol - line);
80 else
81 strbuf_addstr(&linebuf, line);
82 color_print_strbuf(s->fp, color, &linebuf);
83 if (eol)
84 fprintf(s->fp, "\n");
85 else
86 break;
87 at_bol = 1;
88 }
89 if (trail)
90 fprintf(s->fp, "%s", trail);
91 strbuf_release(&linebuf);
92 strbuf_release(&sb);
93 }
94
95 void status_printf_ln(struct wt_status *s, const char *color,
96 const char *fmt, ...)
97 {
98 va_list ap;
99
100 va_start(ap, fmt);
101 status_vprintf(s, 1, color, fmt, ap, "\n");
102 va_end(ap);
103 }
104
105 void status_printf(struct wt_status *s, const char *color,
106 const char *fmt, ...)
107 {
108 va_list ap;
109
110 va_start(ap, fmt);
111 status_vprintf(s, 1, color, fmt, ap, NULL);
112 va_end(ap);
113 }
114
115 static void status_printf_more(struct wt_status *s, const char *color,
116 const char *fmt, ...)
117 {
118 va_list ap;
119
120 va_start(ap, fmt);
121 status_vprintf(s, 0, color, fmt, ap, NULL);
122 va_end(ap);
123 }
124
125 void wt_status_prepare(struct repository *r, struct wt_status *s)
126 {
127 memset(s, 0, sizeof(*s));
128 s->repo = r;
129 memcpy(s->color_palette, default_wt_status_colors,
130 sizeof(default_wt_status_colors));
131 s->show_untracked_files = SHOW_NORMAL_UNTRACKED_FILES;
132 s->use_color = -1;
133 s->relative_paths = 1;
134 s->branch = resolve_refdup("HEAD", 0, NULL, NULL);
135 s->reference = "HEAD";
136 s->fp = stdout;
137 s->index_file = get_index_file();
138 s->change.strdup_strings = 1;
139 s->untracked.strdup_strings = 1;
140 s->ignored.strdup_strings = 1;
141 s->show_branch = -1; /* unspecified */
142 s->show_stash = 0;
143 s->ahead_behind_flags = AHEAD_BEHIND_UNSPECIFIED;
144 s->display_comment_prefix = 0;
145 s->detect_rename = -1;
146 s->rename_score = -1;
147 s->rename_limit = -1;
148 }
149
150 static void wt_longstatus_print_unmerged_header(struct wt_status *s)
151 {
152 int i;
153 int del_mod_conflict = 0;
154 int both_deleted = 0;
155 int not_deleted = 0;
156 const char *c = color(WT_STATUS_HEADER, s);
157
158 status_printf_ln(s, c, _("Unmerged paths:"));
159
160 for (i = 0; i < s->change.nr; i++) {
161 struct string_list_item *it = &(s->change.items[i]);
162 struct wt_status_change_data *d = it->util;
163
164 switch (d->stagemask) {
165 case 0:
166 break;
167 case 1:
168 both_deleted = 1;
169 break;
170 case 3:
171 case 5:
172 del_mod_conflict = 1;
173 break;
174 default:
175 not_deleted = 1;
176 break;
177 }
178 }
179
180 if (!s->hints)
181 return;
182 if (s->whence != FROM_COMMIT)
183 ;
184 else if (!s->is_initial) {
185 if (!strcmp(s->reference, "HEAD"))
186 status_printf_ln(s, c,
187 _(" (use \"git restore --staged <file>...\" to unstage)"));
188 else
189 status_printf_ln(s, c,
190 _(" (use \"git restore --source=%s --staged <file>...\" to unstage)"),
191 s->reference);
192 } else
193 status_printf_ln(s, c, _(" (use \"git rm --cached <file>...\" to unstage)"));
194
195 if (!both_deleted) {
196 if (!del_mod_conflict)
197 status_printf_ln(s, c, _(" (use \"git add <file>...\" to mark resolution)"));
198 else
199 status_printf_ln(s, c, _(" (use \"git add/rm <file>...\" as appropriate to mark resolution)"));
200 } else if (!del_mod_conflict && !not_deleted) {
201 status_printf_ln(s, c, _(" (use \"git rm <file>...\" to mark resolution)"));
202 } else {
203 status_printf_ln(s, c, _(" (use \"git add/rm <file>...\" as appropriate to mark resolution)"));
204 }
205 }
206
207 static void wt_longstatus_print_cached_header(struct wt_status *s)
208 {
209 const char *c = color(WT_STATUS_HEADER, s);
210
211 status_printf_ln(s, c, _("Changes to be committed:"));
212 if (!s->hints)
213 return;
214 if (s->whence != FROM_COMMIT)
215 ; /* NEEDSWORK: use "git reset --unresolve"??? */
216 else if (!s->is_initial) {
217 if (!strcmp(s->reference, "HEAD"))
218 status_printf_ln(s, c
219 , _(" (use \"git restore --staged <file>...\" to unstage)"));
220 else
221 status_printf_ln(s, c,
222 _(" (use \"git restore --source=%s --staged <file>...\" to unstage)"),
223 s->reference);
224 } else
225 status_printf_ln(s, c, _(" (use \"git rm --cached <file>...\" to unstage)"));
226 }
227
228 static void wt_longstatus_print_dirty_header(struct wt_status *s,
229 int has_deleted,
230 int has_dirty_submodules)
231 {
232 const char *c = color(WT_STATUS_HEADER, s);
233
234 status_printf_ln(s, c, _("Changes not staged for commit:"));
235 if (!s->hints)
236 return;
237 if (!has_deleted)
238 status_printf_ln(s, c, _(" (use \"git add <file>...\" to update what will be committed)"));
239 else
240 status_printf_ln(s, c, _(" (use \"git add/rm <file>...\" to update what will be committed)"));
241 status_printf_ln(s, c, _(" (use \"git restore <file>...\" to discard changes in working directory)"));
242 if (has_dirty_submodules)
243 status_printf_ln(s, c, _(" (commit or discard the untracked or modified content in submodules)"));
244 }
245
246 static void wt_longstatus_print_other_header(struct wt_status *s,
247 const char *what,
248 const char *how)
249 {
250 const char *c = color(WT_STATUS_HEADER, s);
251 status_printf_ln(s, c, "%s:", what);
252 if (!s->hints)
253 return;
254 status_printf_ln(s, c, _(" (use \"git %s <file>...\" to include in what will be committed)"), how);
255 }
256
257 static void wt_longstatus_print_trailer(struct wt_status *s)
258 {
259 status_printf_ln(s, color(WT_STATUS_HEADER, s), "%s", "");
260 }
261
262 static const char *wt_status_unmerged_status_string(int stagemask)
263 {
264 switch (stagemask) {
265 case 1:
266 return _("both deleted:");
267 case 2:
268 return _("added by us:");
269 case 3:
270 return _("deleted by them:");
271 case 4:
272 return _("added by them:");
273 case 5:
274 return _("deleted by us:");
275 case 6:
276 return _("both added:");
277 case 7:
278 return _("both modified:");
279 default:
280 BUG("unhandled unmerged status %x", stagemask);
281 }
282 }
283
284 static const char *wt_status_diff_status_string(int status)
285 {
286 switch (status) {
287 case DIFF_STATUS_ADDED:
288 return _("new file:");
289 case DIFF_STATUS_COPIED:
290 return _("copied:");
291 case DIFF_STATUS_DELETED:
292 return _("deleted:");
293 case DIFF_STATUS_MODIFIED:
294 return _("modified:");
295 case DIFF_STATUS_RENAMED:
296 return _("renamed:");
297 case DIFF_STATUS_TYPE_CHANGED:
298 return _("typechange:");
299 case DIFF_STATUS_UNKNOWN:
300 return _("unknown:");
301 case DIFF_STATUS_UNMERGED:
302 return _("unmerged:");
303 default:
304 return NULL;
305 }
306 }
307
308 static int maxwidth(const char *(*label)(int), int minval, int maxval)
309 {
310 int result = 0, i;
311
312 for (i = minval; i <= maxval; i++) {
313 const char *s = label(i);
314 int len = s ? utf8_strwidth(s) : 0;
315 if (len > result)
316 result = len;
317 }
318 return result;
319 }
320
321 static void wt_longstatus_print_unmerged_data(struct wt_status *s,
322 struct string_list_item *it)
323 {
324 const char *c = color(WT_STATUS_UNMERGED, s);
325 struct wt_status_change_data *d = it->util;
326 struct strbuf onebuf = STRBUF_INIT;
327 static char *padding;
328 static int label_width;
329 const char *one, *how;
330 int len;
331
332 if (!padding) {
333 label_width = maxwidth(wt_status_unmerged_status_string, 1, 7);
334 label_width += strlen(" ");
335 padding = xmallocz(label_width);
336 memset(padding, ' ', label_width);
337 }
338
339 one = quote_path(it->string, s->prefix, &onebuf, 0);
340 status_printf(s, color(WT_STATUS_HEADER, s), "\t");
341
342 how = wt_status_unmerged_status_string(d->stagemask);
343 len = label_width - utf8_strwidth(how);
344 status_printf_more(s, c, "%s%.*s%s\n", how, len, padding, one);
345 strbuf_release(&onebuf);
346 }
347
348 static void wt_longstatus_print_change_data(struct wt_status *s,
349 int change_type,
350 struct string_list_item *it)
351 {
352 struct wt_status_change_data *d = it->util;
353 const char *c = color(change_type, s);
354 int status;
355 char *one_name;
356 char *two_name;
357 const char *one, *two;
358 struct strbuf onebuf = STRBUF_INIT, twobuf = STRBUF_INIT;
359 struct strbuf extra = STRBUF_INIT;
360 static char *padding;
361 static int label_width;
362 const char *what;
363 int len;
364
365 if (!padding) {
366 /* If DIFF_STATUS_* uses outside the range [A..Z], we're in trouble */
367 label_width = maxwidth(wt_status_diff_status_string, 'A', 'Z');
368 label_width += strlen(" ");
369 padding = xmallocz(label_width);
370 memset(padding, ' ', label_width);
371 }
372
373 one_name = two_name = it->string;
374 switch (change_type) {
375 case WT_STATUS_UPDATED:
376 status = d->index_status;
377 break;
378 case WT_STATUS_CHANGED:
379 if (d->new_submodule_commits || d->dirty_submodule) {
380 strbuf_addstr(&extra, " (");
381 if (d->new_submodule_commits)
382 strbuf_addstr(&extra, _("new commits, "));
383 if (d->dirty_submodule & DIRTY_SUBMODULE_MODIFIED)
384 strbuf_addstr(&extra, _("modified content, "));
385 if (d->dirty_submodule & DIRTY_SUBMODULE_UNTRACKED)
386 strbuf_addstr(&extra, _("untracked content, "));
387 strbuf_setlen(&extra, extra.len - 2);
388 strbuf_addch(&extra, ')');
389 }
390 status = d->worktree_status;
391 break;
392 default:
393 BUG("unhandled change_type %d in wt_longstatus_print_change_data",
394 change_type);
395 }
396
397 /*
398 * Only pick up the rename it's relevant. If the rename is for
399 * the changed section and we're printing the updated section,
400 * ignore it.
401 */
402 if (d->rename_status == status)
403 one_name = d->rename_source;
404
405 one = quote_path(one_name, s->prefix, &onebuf, 0);
406 two = quote_path(two_name, s->prefix, &twobuf, 0);
407
408 status_printf(s, color(WT_STATUS_HEADER, s), "\t");
409 what = wt_status_diff_status_string(status);
410 if (!what)
411 BUG("unhandled diff status %c", status);
412 len = label_width - utf8_strwidth(what);
413 assert(len >= 0);
414 if (one_name != two_name)
415 status_printf_more(s, c, "%s%.*s%s -> %s",
416 what, len, padding, one, two);
417 else
418 status_printf_more(s, c, "%s%.*s%s",
419 what, len, padding, one);
420 if (extra.len) {
421 status_printf_more(s, color(WT_STATUS_HEADER, s), "%s", extra.buf);
422 strbuf_release(&extra);
423 }
424 status_printf_more(s, GIT_COLOR_NORMAL, "\n");
425 strbuf_release(&onebuf);
426 strbuf_release(&twobuf);
427 }
428
429 static char short_submodule_status(struct wt_status_change_data *d)
430 {
431 if (d->new_submodule_commits)
432 return 'M';
433 if (d->dirty_submodule & DIRTY_SUBMODULE_MODIFIED)
434 return 'm';
435 if (d->dirty_submodule & DIRTY_SUBMODULE_UNTRACKED)
436 return '?';
437 return d->worktree_status;
438 }
439
440 static void wt_status_collect_changed_cb(struct diff_queue_struct *q,
441 struct diff_options *options,
442 void *data)
443 {
444 struct wt_status *s = data;
445 int i;
446
447 if (!q->nr)
448 return;
449 s->workdir_dirty = 1;
450 for (i = 0; i < q->nr; i++) {
451 struct diff_filepair *p;
452 struct string_list_item *it;
453 struct wt_status_change_data *d;
454
455 p = q->queue[i];
456 it = string_list_insert(&s->change, p->two->path);
457 d = it->util;
458 if (!d) {
459 CALLOC_ARRAY(d, 1);
460 it->util = d;
461 }
462 if (!d->worktree_status)
463 d->worktree_status = p->status;
464 if (S_ISGITLINK(p->two->mode)) {
465 d->dirty_submodule = p->two->dirty_submodule;
466 d->new_submodule_commits = !oideq(&p->one->oid,
467 &p->two->oid);
468 if (s->status_format == STATUS_FORMAT_SHORT)
469 d->worktree_status = short_submodule_status(d);
470 }
471
472 switch (p->status) {
473 case DIFF_STATUS_ADDED:
474 d->mode_worktree = p->two->mode;
475 break;
476
477 case DIFF_STATUS_DELETED:
478 d->mode_index = p->one->mode;
479 oidcpy(&d->oid_index, &p->one->oid);
480 /* mode_worktree is zero for a delete. */
481 break;
482
483 case DIFF_STATUS_COPIED:
484 case DIFF_STATUS_RENAMED:
485 if (d->rename_status)
486 BUG("multiple renames on the same target? how?");
487 d->rename_source = xstrdup(p->one->path);
488 d->rename_score = p->score * 100 / MAX_SCORE;
489 d->rename_status = p->status;
490 /* fallthru */
491 case DIFF_STATUS_MODIFIED:
492 case DIFF_STATUS_TYPE_CHANGED:
493 case DIFF_STATUS_UNMERGED:
494 d->mode_index = p->one->mode;
495 d->mode_worktree = p->two->mode;
496 oidcpy(&d->oid_index, &p->one->oid);
497 break;
498
499 default:
500 BUG("unhandled diff-files status '%c'", p->status);
501 break;
502 }
503
504 }
505 }
506
507 static int unmerged_mask(struct index_state *istate, const char *path)
508 {
509 int pos, mask;
510 const struct cache_entry *ce;
511
512 pos = index_name_pos(istate, path, strlen(path));
513 if (0 <= pos)
514 return 0;
515
516 mask = 0;
517 pos = -pos-1;
518 while (pos < istate->cache_nr) {
519 ce = istate->cache[pos++];
520 if (strcmp(ce->name, path) || !ce_stage(ce))
521 break;
522 mask |= (1 << (ce_stage(ce) - 1));
523 }
524 return mask;
525 }
526
527 static void wt_status_collect_updated_cb(struct diff_queue_struct *q,
528 struct diff_options *options,
529 void *data)
530 {
531 struct wt_status *s = data;
532 int i;
533
534 for (i = 0; i < q->nr; i++) {
535 struct diff_filepair *p;
536 struct string_list_item *it;
537 struct wt_status_change_data *d;
538
539 p = q->queue[i];
540 it = string_list_insert(&s->change, p->two->path);
541 d = it->util;
542 if (!d) {
543 CALLOC_ARRAY(d, 1);
544 it->util = d;
545 }
546 if (!d->index_status)
547 d->index_status = p->status;
548 switch (p->status) {
549 case DIFF_STATUS_ADDED:
550 /* Leave {mode,oid}_head zero for an add. */
551 d->mode_index = p->two->mode;
552 oidcpy(&d->oid_index, &p->two->oid);
553 s->committable = 1;
554 break;
555 case DIFF_STATUS_DELETED:
556 d->mode_head = p->one->mode;
557 oidcpy(&d->oid_head, &p->one->oid);
558 s->committable = 1;
559 /* Leave {mode,oid}_index zero for a delete. */
560 break;
561
562 case DIFF_STATUS_COPIED:
563 case DIFF_STATUS_RENAMED:
564 if (d->rename_status)
565 BUG("multiple renames on the same target? how?");
566 d->rename_source = xstrdup(p->one->path);
567 d->rename_score = p->score * 100 / MAX_SCORE;
568 d->rename_status = p->status;
569 /* fallthru */
570 case DIFF_STATUS_MODIFIED:
571 case DIFF_STATUS_TYPE_CHANGED:
572 d->mode_head = p->one->mode;
573 d->mode_index = p->two->mode;
574 oidcpy(&d->oid_head, &p->one->oid);
575 oidcpy(&d->oid_index, &p->two->oid);
576 s->committable = 1;
577 break;
578 case DIFF_STATUS_UNMERGED:
579 d->stagemask = unmerged_mask(s->repo->index,
580 p->two->path);
581 /*
582 * Don't bother setting {mode,oid}_{head,index} since the print
583 * code will output the stage values directly and not use the
584 * values in these fields.
585 */
586 break;
587
588 default:
589 BUG("unhandled diff-index status '%c'", p->status);
590 break;
591 }
592 }
593 }
594
595 static void wt_status_collect_changes_worktree(struct wt_status *s)
596 {
597 struct rev_info rev;
598
599 repo_init_revisions(s->repo, &rev, NULL);
600 setup_revisions(0, NULL, &rev, NULL);
601 rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
602 rev.diffopt.flags.dirty_submodules = 1;
603 rev.diffopt.ita_invisible_in_index = 1;
604 if (!s->show_untracked_files)
605 rev.diffopt.flags.ignore_untracked_in_submodules = 1;
606 if (s->ignore_submodule_arg) {
607 rev.diffopt.flags.override_submodule_config = 1;
608 handle_ignore_submodules_arg(&rev.diffopt, s->ignore_submodule_arg);
609 } else if (!rev.diffopt.flags.ignore_submodule_set &&
610 s->show_untracked_files != SHOW_NO_UNTRACKED_FILES)
611 handle_ignore_submodules_arg(&rev.diffopt, "none");
612 rev.diffopt.format_callback = wt_status_collect_changed_cb;
613 rev.diffopt.format_callback_data = s;
614 rev.diffopt.detect_rename = s->detect_rename >= 0 ? s->detect_rename : rev.diffopt.detect_rename;
615 rev.diffopt.rename_limit = s->rename_limit >= 0 ? s->rename_limit : rev.diffopt.rename_limit;
616 rev.diffopt.rename_score = s->rename_score >= 0 ? s->rename_score : rev.diffopt.rename_score;
617 copy_pathspec(&rev.prune_data, &s->pathspec);
618 run_diff_files(&rev, 0);
619 clear_pathspec(&rev.prune_data);
620 }
621
622 static void wt_status_collect_changes_index(struct wt_status *s)
623 {
624 struct rev_info rev;
625 struct setup_revision_opt opt;
626
627 repo_init_revisions(s->repo, &rev, NULL);
628 memset(&opt, 0, sizeof(opt));
629 opt.def = s->is_initial ? empty_tree_oid_hex() : s->reference;
630 setup_revisions(0, NULL, &rev, &opt);
631
632 rev.diffopt.flags.override_submodule_config = 1;
633 rev.diffopt.ita_invisible_in_index = 1;
634 if (s->ignore_submodule_arg) {
635 handle_ignore_submodules_arg(&rev.diffopt, s->ignore_submodule_arg);
636 } else {
637 /*
638 * Unless the user did explicitly request a submodule ignore
639 * mode by passing a command line option we do not ignore any
640 * changed submodule SHA-1s when comparing index and HEAD, no
641 * matter what is configured. Otherwise the user won't be
642 * shown any submodules manually added (and which are
643 * staged to be committed), which would be really confusing.
644 */
645 handle_ignore_submodules_arg(&rev.diffopt, "dirty");
646 }
647
648 rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
649 rev.diffopt.format_callback = wt_status_collect_updated_cb;
650 rev.diffopt.format_callback_data = s;
651 rev.diffopt.detect_rename = s->detect_rename >= 0 ? s->detect_rename : rev.diffopt.detect_rename;
652 rev.diffopt.rename_limit = s->rename_limit >= 0 ? s->rename_limit : rev.diffopt.rename_limit;
653 rev.diffopt.rename_score = s->rename_score >= 0 ? s->rename_score : rev.diffopt.rename_score;
654 copy_pathspec(&rev.prune_data, &s->pathspec);
655 run_diff_index(&rev, 1);
656 object_array_clear(&rev.pending);
657 clear_pathspec(&rev.prune_data);
658 }
659
660 static int add_file_to_list(const struct object_id *oid,
661 struct strbuf *base, const char *path,
662 unsigned int mode, void *context)
663 {
664 struct string_list_item *it;
665 struct wt_status_change_data *d;
666 struct wt_status *s = context;
667 struct strbuf full_name = STRBUF_INIT;
668
669 if (S_ISDIR(mode))
670 return READ_TREE_RECURSIVE;
671
672 strbuf_add(&full_name, base->buf, base->len);
673 strbuf_addstr(&full_name, path);
674 it = string_list_insert(&s->change, full_name.buf);
675 d = it->util;
676 if (!d) {
677 CALLOC_ARRAY(d, 1);
678 it->util = d;
679 }
680
681 d->index_status = DIFF_STATUS_ADDED;
682 /* Leave {mode,oid}_head zero for adds. */
683 d->mode_index = mode;
684 oidcpy(&d->oid_index, oid);
685 s->committable = 1;
686 strbuf_release(&full_name);
687 return 0;
688 }
689
690 static void wt_status_collect_changes_initial(struct wt_status *s)
691 {
692 struct index_state *istate = s->repo->index;
693 int i;
694
695 for (i = 0; i < istate->cache_nr; i++) {
696 struct string_list_item *it;
697 struct wt_status_change_data *d;
698 const struct cache_entry *ce = istate->cache[i];
699
700 if (!ce_path_match(istate, ce, &s->pathspec, NULL))
701 continue;
702 if (ce_intent_to_add(ce))
703 continue;
704 if (S_ISSPARSEDIR(ce->ce_mode)) {
705 /*
706 * This is a sparse directory entry, so we want to collect all
707 * of the added files within the tree. This requires recursively
708 * expanding the trees to find the elements that are new in this
709 * tree and marking them with DIFF_STATUS_ADDED.
710 */
711 struct strbuf base = STRBUF_INIT;
712 struct pathspec ps = { 0 };
713 struct tree *tree = lookup_tree(istate->repo, &ce->oid);
714
715 ps.recursive = 1;
716 ps.has_wildcard = 1;
717 ps.max_depth = -1;
718
719 strbuf_add(&base, ce->name, ce->ce_namelen);
720 read_tree_at(istate->repo, tree, &base, &ps,
721 add_file_to_list, s);
722 continue;
723 }
724
725 it = string_list_insert(&s->change, ce->name);
726 d = it->util;
727 if (!d) {
728 CALLOC_ARRAY(d, 1);
729 it->util = d;
730 }
731 if (ce_stage(ce)) {
732 d->index_status = DIFF_STATUS_UNMERGED;
733 d->stagemask |= (1 << (ce_stage(ce) - 1));
734 /*
735 * Don't bother setting {mode,oid}_{head,index} since the print
736 * code will output the stage values directly and not use the
737 * values in these fields.
738 */
739 s->committable = 1;
740 } else {
741 d->index_status = DIFF_STATUS_ADDED;
742 /* Leave {mode,oid}_head zero for adds. */
743 d->mode_index = ce->ce_mode;
744 oidcpy(&d->oid_index, &ce->oid);
745 s->committable = 1;
746 }
747 }
748 }
749
750 static void wt_status_collect_untracked(struct wt_status *s)
751 {
752 int i;
753 struct dir_struct dir = DIR_INIT;
754 uint64_t t_begin = getnanotime();
755 struct index_state *istate = s->repo->index;
756
757 if (!s->show_untracked_files)
758 return;
759
760 if (s->show_untracked_files != SHOW_ALL_UNTRACKED_FILES)
761 dir.flags |=
762 DIR_SHOW_OTHER_DIRECTORIES | DIR_HIDE_EMPTY_DIRECTORIES;
763 if (s->show_ignored_mode) {
764 dir.flags |= DIR_SHOW_IGNORED_TOO;
765
766 if (s->show_ignored_mode == SHOW_MATCHING_IGNORED)
767 dir.flags |= DIR_SHOW_IGNORED_TOO_MODE_MATCHING;
768 } else {
769 dir.untracked = istate->untracked;
770 }
771
772 setup_standard_excludes(&dir);
773
774 fill_directory(&dir, istate, &s->pathspec);
775
776 for (i = 0; i < dir.nr; i++) {
777 struct dir_entry *ent = dir.entries[i];
778 if (index_name_is_other(istate, ent->name, ent->len))
779 string_list_insert(&s->untracked, ent->name);
780 }
781
782 for (i = 0; i < dir.ignored_nr; i++) {
783 struct dir_entry *ent = dir.ignored[i];
784 if (index_name_is_other(istate, ent->name, ent->len))
785 string_list_insert(&s->ignored, ent->name);
786 }
787
788 dir_clear(&dir);
789
790 if (advice_enabled(ADVICE_STATUS_U_OPTION))
791 s->untracked_in_ms = (getnanotime() - t_begin) / 1000000;
792 }
793
794 static int has_unmerged(struct wt_status *s)
795 {
796 int i;
797
798 for (i = 0; i < s->change.nr; i++) {
799 struct wt_status_change_data *d;
800 d = s->change.items[i].util;
801 if (d->stagemask)
802 return 1;
803 }
804 return 0;
805 }
806
807 void wt_status_collect(struct wt_status *s)
808 {
809 trace2_region_enter("status", "worktrees", s->repo);
810 wt_status_collect_changes_worktree(s);
811 trace2_region_leave("status", "worktrees", s->repo);
812
813 if (s->is_initial) {
814 trace2_region_enter("status", "initial", s->repo);
815 wt_status_collect_changes_initial(s);
816 trace2_region_leave("status", "initial", s->repo);
817 } else {
818 trace2_region_enter("status", "index", s->repo);
819 wt_status_collect_changes_index(s);
820 trace2_region_leave("status", "index", s->repo);
821 }
822
823 trace2_region_enter("status", "untracked", s->repo);
824 wt_status_collect_untracked(s);
825 trace2_region_leave("status", "untracked", s->repo);
826
827 wt_status_get_state(s->repo, &s->state, s->branch && !strcmp(s->branch, "HEAD"));
828 if (s->state.merge_in_progress && !has_unmerged(s))
829 s->committable = 1;
830 }
831
832 void wt_status_collect_free_buffers(struct wt_status *s)
833 {
834 wt_status_state_free_buffers(&s->state);
835 }
836
837 void wt_status_state_free_buffers(struct wt_status_state *state)
838 {
839 FREE_AND_NULL(state->branch);
840 FREE_AND_NULL(state->onto);
841 FREE_AND_NULL(state->detached_from);
842 }
843
844 static void wt_longstatus_print_unmerged(struct wt_status *s)
845 {
846 int shown_header = 0;
847 int i;
848
849 for (i = 0; i < s->change.nr; i++) {
850 struct wt_status_change_data *d;
851 struct string_list_item *it;
852 it = &(s->change.items[i]);
853 d = it->util;
854 if (!d->stagemask)
855 continue;
856 if (!shown_header) {
857 wt_longstatus_print_unmerged_header(s);
858 shown_header = 1;
859 }
860 wt_longstatus_print_unmerged_data(s, it);
861 }
862 if (shown_header)
863 wt_longstatus_print_trailer(s);
864
865 }
866
867 static void wt_longstatus_print_updated(struct wt_status *s)
868 {
869 int shown_header = 0;
870 int i;
871
872 for (i = 0; i < s->change.nr; i++) {
873 struct wt_status_change_data *d;
874 struct string_list_item *it;
875 it = &(s->change.items[i]);
876 d = it->util;
877 if (!d->index_status ||
878 d->index_status == DIFF_STATUS_UNMERGED)
879 continue;
880 if (!shown_header) {
881 wt_longstatus_print_cached_header(s);
882 shown_header = 1;
883 }
884 wt_longstatus_print_change_data(s, WT_STATUS_UPDATED, it);
885 }
886 if (shown_header)
887 wt_longstatus_print_trailer(s);
888 }
889
890 /*
891 * -1 : has delete
892 * 0 : no change
893 * 1 : some change but no delete
894 */
895 static int wt_status_check_worktree_changes(struct wt_status *s,
896 int *dirty_submodules)
897 {
898 int i;
899 int changes = 0;
900
901 *dirty_submodules = 0;
902
903 for (i = 0; i < s->change.nr; i++) {
904 struct wt_status_change_data *d;
905 d = s->change.items[i].util;
906 if (!d->worktree_status ||
907 d->worktree_status == DIFF_STATUS_UNMERGED)
908 continue;
909 if (!changes)
910 changes = 1;
911 if (d->dirty_submodule)
912 *dirty_submodules = 1;
913 if (d->worktree_status == DIFF_STATUS_DELETED)
914 changes = -1;
915 }
916 return changes;
917 }
918
919 static void wt_longstatus_print_changed(struct wt_status *s)
920 {
921 int i, dirty_submodules;
922 int worktree_changes = wt_status_check_worktree_changes(s, &dirty_submodules);
923
924 if (!worktree_changes)
925 return;
926
927 wt_longstatus_print_dirty_header(s, worktree_changes < 0, dirty_submodules);
928
929 for (i = 0; i < s->change.nr; i++) {
930 struct wt_status_change_data *d;
931 struct string_list_item *it;
932 it = &(s->change.items[i]);
933 d = it->util;
934 if (!d->worktree_status ||
935 d->worktree_status == DIFF_STATUS_UNMERGED)
936 continue;
937 wt_longstatus_print_change_data(s, WT_STATUS_CHANGED, it);
938 }
939 wt_longstatus_print_trailer(s);
940 }
941
942 static int stash_count_refs(struct object_id *ooid, struct object_id *noid,
943 const char *email, timestamp_t timestamp, int tz,
944 const char *message, void *cb_data)
945 {
946 int *c = cb_data;
947 (*c)++;
948 return 0;
949 }
950
951 static int count_stash_entries(void)
952 {
953 int n = 0;
954 for_each_reflog_ent("refs/stash", stash_count_refs, &n);
955 return n;
956 }
957
958 static void wt_longstatus_print_stash_summary(struct wt_status *s)
959 {
960 int stash_count = count_stash_entries();
961
962 if (stash_count > 0)
963 status_printf_ln(s, GIT_COLOR_NORMAL,
964 Q_("Your stash currently has %d entry",
965 "Your stash currently has %d entries", stash_count),
966 stash_count);
967 }
968
969 static void wt_longstatus_print_submodule_summary(struct wt_status *s, int uncommitted)
970 {
971 struct child_process sm_summary = CHILD_PROCESS_INIT;
972 struct strbuf cmd_stdout = STRBUF_INIT;
973 struct strbuf summary = STRBUF_INIT;
974 char *summary_content;
975
976 strvec_pushf(&sm_summary.env_array, "GIT_INDEX_FILE=%s", s->index_file);
977
978 strvec_push(&sm_summary.args, "submodule");
979 strvec_push(&sm_summary.args, "summary");
980 strvec_push(&sm_summary.args, uncommitted ? "--files" : "--cached");
981 strvec_push(&sm_summary.args, "--for-status");
982 strvec_push(&sm_summary.args, "--summary-limit");
983 strvec_pushf(&sm_summary.args, "%d", s->submodule_summary);
984 if (!uncommitted)
985 strvec_push(&sm_summary.args, s->amend ? "HEAD^" : "HEAD");
986
987 sm_summary.git_cmd = 1;
988 sm_summary.no_stdin = 1;
989
990 capture_command(&sm_summary, &cmd_stdout, 1024);
991
992 /* prepend header, only if there's an actual output */
993 if (cmd_stdout.len) {
994 if (uncommitted)
995 strbuf_addstr(&summary, _("Submodules changed but not updated:"));
996 else
997 strbuf_addstr(&summary, _("Submodule changes to be committed:"));
998 strbuf_addstr(&summary, "\n\n");
999 }
1000 strbuf_addbuf(&summary, &cmd_stdout);
1001 strbuf_release(&cmd_stdout);
1002
1003 if (s->display_comment_prefix) {
1004 size_t len;
1005 summary_content = strbuf_detach(&summary, &len);
1006 strbuf_add_commented_lines(&summary, summary_content, len);
1007 free(summary_content);
1008 }
1009
1010 fputs(summary.buf, s->fp);
1011 strbuf_release(&summary);
1012 }
1013
1014 static void wt_longstatus_print_other(struct wt_status *s,
1015 struct string_list *l,
1016 const char *what,
1017 const char *how)
1018 {
1019 int i;
1020 struct strbuf buf = STRBUF_INIT;
1021 static struct string_list output = STRING_LIST_INIT_DUP;
1022 struct column_options copts;
1023
1024 if (!l->nr)
1025 return;
1026
1027 wt_longstatus_print_other_header(s, what, how);
1028
1029 for (i = 0; i < l->nr; i++) {
1030 struct string_list_item *it;
1031 const char *path;
1032 it = &(l->items[i]);
1033 path = quote_path(it->string, s->prefix, &buf, 0);
1034 if (column_active(s->colopts)) {
1035 string_list_append(&output, path);
1036 continue;
1037 }
1038 status_printf(s, color(WT_STATUS_HEADER, s), "\t");
1039 status_printf_more(s, color(WT_STATUS_UNTRACKED, s),
1040 "%s\n", path);
1041 }
1042
1043 strbuf_release(&buf);
1044 if (!column_active(s->colopts))
1045 goto conclude;
1046
1047 strbuf_addf(&buf, "%s%s\t%s",
1048 color(WT_STATUS_HEADER, s),
1049 s->display_comment_prefix ? "#" : "",
1050 color(WT_STATUS_UNTRACKED, s));
1051 memset(&copts, 0, sizeof(copts));
1052 copts.padding = 1;
1053 copts.indent = buf.buf;
1054 if (want_color(s->use_color))
1055 copts.nl = GIT_COLOR_RESET "\n";
1056 print_columns(&output, s->colopts, &copts);
1057 string_list_clear(&output, 0);
1058 strbuf_release(&buf);
1059 conclude:
1060 status_printf_ln(s, GIT_COLOR_NORMAL, "%s", "");
1061 }
1062
1063 size_t wt_status_locate_end(const char *s, size_t len)
1064 {
1065 const char *p;
1066 struct strbuf pattern = STRBUF_INIT;
1067
1068 strbuf_addf(&pattern, "\n%c %s", comment_line_char, cut_line);
1069 if (starts_with(s, pattern.buf + 1))
1070 len = 0;
1071 else if ((p = strstr(s, pattern.buf)))
1072 len = p - s + 1;
1073 strbuf_release(&pattern);
1074 return len;
1075 }
1076
1077 void wt_status_append_cut_line(struct strbuf *buf)
1078 {
1079 const char *explanation = _("Do not modify or remove the line above.\nEverything below it will be ignored.");
1080
1081 strbuf_commented_addf(buf, "%s", cut_line);
1082 strbuf_add_commented_lines(buf, explanation, strlen(explanation));
1083 }
1084
1085 void wt_status_add_cut_line(FILE *fp)
1086 {
1087 struct strbuf buf = STRBUF_INIT;
1088
1089 wt_status_append_cut_line(&buf);
1090 fputs(buf.buf, fp);
1091 strbuf_release(&buf);
1092 }
1093
1094 static void wt_longstatus_print_verbose(struct wt_status *s)
1095 {
1096 struct rev_info rev;
1097 struct setup_revision_opt opt;
1098 int dirty_submodules;
1099 const char *c = color(WT_STATUS_HEADER, s);
1100
1101 repo_init_revisions(s->repo, &rev, NULL);
1102 rev.diffopt.flags.allow_textconv = 1;
1103 rev.diffopt.ita_invisible_in_index = 1;
1104
1105 memset(&opt, 0, sizeof(opt));
1106 opt.def = s->is_initial ? empty_tree_oid_hex() : s->reference;
1107 setup_revisions(0, NULL, &rev, &opt);
1108
1109 rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
1110 rev.diffopt.detect_rename = s->detect_rename >= 0 ? s->detect_rename : rev.diffopt.detect_rename;
1111 rev.diffopt.rename_limit = s->rename_limit >= 0 ? s->rename_limit : rev.diffopt.rename_limit;
1112 rev.diffopt.rename_score = s->rename_score >= 0 ? s->rename_score : rev.diffopt.rename_score;
1113 rev.diffopt.file = s->fp;
1114 rev.diffopt.close_file = 0;
1115 /*
1116 * If we're not going to stdout, then we definitely don't
1117 * want color, since we are going to the commit message
1118 * file (and even the "auto" setting won't work, since it
1119 * will have checked isatty on stdout). But we then do want
1120 * to insert the scissor line here to reliably remove the
1121 * diff before committing.
1122 */
1123 if (s->fp != stdout) {
1124 rev.diffopt.use_color = 0;
1125 wt_status_add_cut_line(s->fp);
1126 }
1127 if (s->verbose > 1 && s->committable) {
1128 /* print_updated() printed a header, so do we */
1129 if (s->fp != stdout)
1130 wt_longstatus_print_trailer(s);
1131 status_printf_ln(s, c, _("Changes to be committed:"));
1132 rev.diffopt.a_prefix = "c/";
1133 rev.diffopt.b_prefix = "i/";
1134 } /* else use prefix as per user config */
1135 run_diff_index(&rev, 1);
1136 if (s->verbose > 1 &&
1137 wt_status_check_worktree_changes(s, &dirty_submodules)) {
1138 status_printf_ln(s, c,
1139 "--------------------------------------------------");
1140 status_printf_ln(s, c, _("Changes not staged for commit:"));
1141 setup_work_tree();
1142 rev.diffopt.a_prefix = "i/";
1143 rev.diffopt.b_prefix = "w/";
1144 run_diff_files(&rev, 0);
1145 }
1146 }
1147
1148 static void wt_longstatus_print_tracking(struct wt_status *s)
1149 {
1150 struct strbuf sb = STRBUF_INIT;
1151 const char *cp, *ep, *branch_name;
1152 struct branch *branch;
1153 char comment_line_string[3];
1154 int i;
1155 uint64_t t_begin = 0;
1156
1157 assert(s->branch && !s->is_initial);
1158 if (!skip_prefix(s->branch, "refs/heads/", &branch_name))
1159 return;
1160 branch = branch_get(branch_name);
1161
1162 t_begin = getnanotime();
1163
1164 if (!format_tracking_info(branch, &sb, s->ahead_behind_flags))
1165 return;
1166
1167 if (advice_enabled(ADVICE_STATUS_AHEAD_BEHIND_WARNING) &&
1168 s->ahead_behind_flags == AHEAD_BEHIND_FULL) {
1169 uint64_t t_delta_in_ms = (getnanotime() - t_begin) / 1000000;
1170 if (t_delta_in_ms > AB_DELAY_WARNING_IN_MS) {
1171 strbuf_addf(&sb, _("\n"
1172 "It took %.2f seconds to compute the branch ahead/behind values.\n"
1173 "You can use '--no-ahead-behind' to avoid this.\n"),
1174 t_delta_in_ms / 1000.0);
1175 }
1176 }
1177
1178 i = 0;
1179 if (s->display_comment_prefix) {
1180 comment_line_string[i++] = comment_line_char;
1181 comment_line_string[i++] = ' ';
1182 }
1183 comment_line_string[i] = '\0';
1184
1185 for (cp = sb.buf; (ep = strchr(cp, '\n')) != NULL; cp = ep + 1)
1186 color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s),
1187 "%s%.*s", comment_line_string,
1188 (int)(ep - cp), cp);
1189 if (s->display_comment_prefix)
1190 color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s), "%c",
1191 comment_line_char);
1192 else
1193 fputs("\n", s->fp);
1194 strbuf_release(&sb);
1195 }
1196
1197 static void show_merge_in_progress(struct wt_status *s,
1198 const char *color)
1199 {
1200 if (has_unmerged(s)) {
1201 status_printf_ln(s, color, _("You have unmerged paths."));
1202 if (s->hints) {
1203 status_printf_ln(s, color,
1204 _(" (fix conflicts and run \"git commit\")"));
1205 status_printf_ln(s, color,
1206 _(" (use \"git merge --abort\" to abort the merge)"));
1207 }
1208 } else {
1209 status_printf_ln(s, color,
1210 _("All conflicts fixed but you are still merging."));
1211 if (s->hints)
1212 status_printf_ln(s, color,
1213 _(" (use \"git commit\" to conclude merge)"));
1214 }
1215 wt_longstatus_print_trailer(s);
1216 }
1217
1218 static void show_am_in_progress(struct wt_status *s,
1219 const char *color)
1220 {
1221 int am_empty_patch;
1222
1223 status_printf_ln(s, color,
1224 _("You are in the middle of an am session."));
1225 if (s->state.am_empty_patch)
1226 status_printf_ln(s, color,
1227 _("The current patch is empty."));
1228 if (s->hints) {
1229 am_empty_patch = s->state.am_empty_patch;
1230 if (!am_empty_patch)
1231 status_printf_ln(s, color,
1232 _(" (fix conflicts and then run \"git am --continue\")"));
1233 status_printf_ln(s, color,
1234 _(" (use \"git am --skip\" to skip this patch)"));
1235 if (am_empty_patch)
1236 status_printf_ln(s, color,
1237 _(" (use \"git am --allow-empty\" to record this patch as an empty commit)"));
1238 status_printf_ln(s, color,
1239 _(" (use \"git am --abort\" to restore the original branch)"));
1240 }
1241 wt_longstatus_print_trailer(s);
1242 }
1243
1244 static char *read_line_from_git_path(const char *filename)
1245 {
1246 struct strbuf buf = STRBUF_INIT;
1247 FILE *fp = fopen_or_warn(git_path("%s", filename), "r");
1248
1249 if (!fp) {
1250 strbuf_release(&buf);
1251 return NULL;
1252 }
1253 strbuf_getline_lf(&buf, fp);
1254 if (!fclose(fp)) {
1255 return strbuf_detach(&buf, NULL);
1256 } else {
1257 strbuf_release(&buf);
1258 return NULL;
1259 }
1260 }
1261
1262 static int split_commit_in_progress(struct wt_status *s)
1263 {
1264 int split_in_progress = 0;
1265 char *head, *orig_head, *rebase_amend, *rebase_orig_head;
1266
1267 if ((!s->amend && !s->nowarn && !s->workdir_dirty) ||
1268 !s->branch || strcmp(s->branch, "HEAD"))
1269 return 0;
1270
1271 head = read_line_from_git_path("HEAD");
1272 orig_head = read_line_from_git_path("ORIG_HEAD");
1273 rebase_amend = read_line_from_git_path("rebase-merge/amend");
1274 rebase_orig_head = read_line_from_git_path("rebase-merge/orig-head");
1275
1276 if (!head || !orig_head || !rebase_amend || !rebase_orig_head)
1277 ; /* fall through, no split in progress */
1278 else if (!strcmp(rebase_amend, rebase_orig_head))
1279 split_in_progress = !!strcmp(head, rebase_amend);
1280 else if (strcmp(orig_head, rebase_orig_head))
1281 split_in_progress = 1;
1282
1283 free(head);
1284 free(orig_head);
1285 free(rebase_amend);
1286 free(rebase_orig_head);
1287
1288 return split_in_progress;
1289 }
1290
1291 /*
1292 * Turn
1293 * "pick d6a2f0303e897ec257dd0e0a39a5ccb709bc2047 some message"
1294 * into
1295 * "pick d6a2f03 some message"
1296 *
1297 * The function assumes that the line does not contain useless spaces
1298 * before or after the command.
1299 */
1300 static void abbrev_oid_in_line(struct strbuf *line)
1301 {
1302 struct strbuf **split;
1303 int i;
1304
1305 if (starts_with(line->buf, "exec ") ||
1306 starts_with(line->buf, "x ") ||
1307 starts_with(line->buf, "label ") ||
1308 starts_with(line->buf, "l "))
1309 return;
1310
1311 split = strbuf_split_max(line, ' ', 3);
1312 if (split[0] && split[1]) {
1313 struct object_id oid;
1314
1315 /*
1316 * strbuf_split_max left a space. Trim it and re-add
1317 * it after abbreviation.
1318 */
1319 strbuf_trim(split[1]);
1320 if (!get_oid(split[1]->buf, &oid)) {
1321 strbuf_reset(split[1]);
1322 strbuf_add_unique_abbrev(split[1], &oid,
1323 DEFAULT_ABBREV);
1324 strbuf_addch(split[1], ' ');
1325 strbuf_reset(line);
1326 for (i = 0; split[i]; i++)
1327 strbuf_addbuf(line, split[i]);
1328 }
1329 }
1330 strbuf_list_free(split);
1331 }
1332
1333 static int read_rebase_todolist(const char *fname, struct string_list *lines)
1334 {
1335 struct strbuf line = STRBUF_INIT;
1336 FILE *f = fopen(git_path("%s", fname), "r");
1337
1338 if (!f) {
1339 if (errno == ENOENT)
1340 return -1;
1341 die_errno("Could not open file %s for reading",
1342 git_path("%s", fname));
1343 }
1344 while (!strbuf_getline_lf(&line, f)) {
1345 if (line.len && line.buf[0] == comment_line_char)
1346 continue;
1347 strbuf_trim(&line);
1348 if (!line.len)
1349 continue;
1350 abbrev_oid_in_line(&line);
1351 string_list_append(lines, line.buf);
1352 }
1353 fclose(f);
1354 strbuf_release(&line);
1355 return 0;
1356 }
1357
1358 static void show_rebase_information(struct wt_status *s,
1359 const char *color)
1360 {
1361 if (s->state.rebase_interactive_in_progress) {
1362 int i;
1363 int nr_lines_to_show = 2;
1364
1365 struct string_list have_done = STRING_LIST_INIT_DUP;
1366 struct string_list yet_to_do = STRING_LIST_INIT_DUP;
1367
1368 read_rebase_todolist("rebase-merge/done", &have_done);
1369 if (read_rebase_todolist("rebase-merge/git-rebase-todo",
1370 &yet_to_do))
1371 status_printf_ln(s, color,
1372 _("git-rebase-todo is missing."));
1373 if (have_done.nr == 0)
1374 status_printf_ln(s, color, _("No commands done."));
1375 else {
1376 status_printf_ln(s, color,
1377 Q_("Last command done (%d command done):",
1378 "Last commands done (%d commands done):",
1379 have_done.nr),
1380 have_done.nr);
1381 for (i = (have_done.nr > nr_lines_to_show)
1382 ? have_done.nr - nr_lines_to_show : 0;
1383 i < have_done.nr;
1384 i++)
1385 status_printf_ln(s, color, " %s", have_done.items[i].string);
1386 if (have_done.nr > nr_lines_to_show && s->hints)
1387 status_printf_ln(s, color,
1388 _(" (see more in file %s)"), git_path("rebase-merge/done"));
1389 }
1390
1391 if (yet_to_do.nr == 0)
1392 status_printf_ln(s, color,
1393 _("No commands remaining."));
1394 else {
1395 status_printf_ln(s, color,
1396 Q_("Next command to do (%d remaining command):",
1397 "Next commands to do (%d remaining commands):",
1398 yet_to_do.nr),
1399 yet_to_do.nr);
1400 for (i = 0; i < nr_lines_to_show && i < yet_to_do.nr; i++)
1401 status_printf_ln(s, color, " %s", yet_to_do.items[i].string);
1402 if (s->hints)
1403 status_printf_ln(s, color,
1404 _(" (use \"git rebase --edit-todo\" to view and edit)"));
1405 }
1406 string_list_clear(&yet_to_do, 0);
1407 string_list_clear(&have_done, 0);
1408 }
1409 }
1410
1411 static void print_rebase_state(struct wt_status *s,
1412 const char *color)
1413 {
1414 if (s->state.branch)
1415 status_printf_ln(s, color,
1416 _("You are currently rebasing branch '%s' on '%s'."),
1417 s->state.branch,
1418 s->state.onto);
1419 else
1420 status_printf_ln(s, color,
1421 _("You are currently rebasing."));
1422 }
1423
1424 static void show_rebase_in_progress(struct wt_status *s,
1425 const char *color)
1426 {
1427 struct stat st;
1428
1429 show_rebase_information(s, color);
1430 if (has_unmerged(s)) {
1431 print_rebase_state(s, color);
1432 if (s->hints) {
1433 status_printf_ln(s, color,
1434 _(" (fix conflicts and then run \"git rebase --continue\")"));
1435 status_printf_ln(s, color,
1436 _(" (use \"git rebase --skip\" to skip this patch)"));
1437 status_printf_ln(s, color,
1438 _(" (use \"git rebase --abort\" to check out the original branch)"));
1439 }
1440 } else if (s->state.rebase_in_progress ||
1441 !stat(git_path_merge_msg(s->repo), &st)) {
1442 print_rebase_state(s, color);
1443 if (s->hints)
1444 status_printf_ln(s, color,
1445 _(" (all conflicts fixed: run \"git rebase --continue\")"));
1446 } else if (split_commit_in_progress(s)) {
1447 if (s->state.branch)
1448 status_printf_ln(s, color,
1449 _("You are currently splitting a commit while rebasing branch '%s' on '%s'."),
1450 s->state.branch,
1451 s->state.onto);
1452 else
1453 status_printf_ln(s, color,
1454 _("You are currently splitting a commit during a rebase."));
1455 if (s->hints)
1456 status_printf_ln(s, color,
1457 _(" (Once your working directory is clean, run \"git rebase --continue\")"));
1458 } else {
1459 if (s->state.branch)
1460 status_printf_ln(s, color,
1461 _("You are currently editing a commit while rebasing branch '%s' on '%s'."),
1462 s->state.branch,
1463 s->state.onto);
1464 else
1465 status_printf_ln(s, color,
1466 _("You are currently editing a commit during a rebase."));
1467 if (s->hints && !s->amend) {
1468 status_printf_ln(s, color,
1469 _(" (use \"git commit --amend\" to amend the current commit)"));
1470 status_printf_ln(s, color,
1471 _(" (use \"git rebase --continue\" once you are satisfied with your changes)"));
1472 }
1473 }
1474 wt_longstatus_print_trailer(s);
1475 }
1476
1477 static void show_cherry_pick_in_progress(struct wt_status *s,
1478 const char *color)
1479 {
1480 if (is_null_oid(&s->state.cherry_pick_head_oid))
1481 status_printf_ln(s, color,
1482 _("Cherry-pick currently in progress."));
1483 else
1484 status_printf_ln(s, color,
1485 _("You are currently cherry-picking commit %s."),
1486 find_unique_abbrev(&s->state.cherry_pick_head_oid,
1487 DEFAULT_ABBREV));
1488
1489 if (s->hints) {
1490 if (has_unmerged(s))
1491 status_printf_ln(s, color,
1492 _(" (fix conflicts and run \"git cherry-pick --continue\")"));
1493 else if (is_null_oid(&s->state.cherry_pick_head_oid))
1494 status_printf_ln(s, color,
1495 _(" (run \"git cherry-pick --continue\" to continue)"));
1496 else
1497 status_printf_ln(s, color,
1498 _(" (all conflicts fixed: run \"git cherry-pick --continue\")"));
1499 status_printf_ln(s, color,
1500 _(" (use \"git cherry-pick --skip\" to skip this patch)"));
1501 status_printf_ln(s, color,
1502 _(" (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"));
1503 }
1504 wt_longstatus_print_trailer(s);
1505 }
1506
1507 static void show_revert_in_progress(struct wt_status *s,
1508 const char *color)
1509 {
1510 if (is_null_oid(&s->state.revert_head_oid))
1511 status_printf_ln(s, color,
1512 _("Revert currently in progress."));
1513 else
1514 status_printf_ln(s, color,
1515 _("You are currently reverting commit %s."),
1516 find_unique_abbrev(&s->state.revert_head_oid,
1517 DEFAULT_ABBREV));
1518 if (s->hints) {
1519 if (has_unmerged(s))
1520 status_printf_ln(s, color,
1521 _(" (fix conflicts and run \"git revert --continue\")"));
1522 else if (is_null_oid(&s->state.revert_head_oid))
1523 status_printf_ln(s, color,
1524 _(" (run \"git revert --continue\" to continue)"));
1525 else
1526 status_printf_ln(s, color,
1527 _(" (all conflicts fixed: run \"git revert --continue\")"));
1528 status_printf_ln(s, color,
1529 _(" (use \"git revert --skip\" to skip this patch)"));
1530 status_printf_ln(s, color,
1531 _(" (use \"git revert --abort\" to cancel the revert operation)"));
1532 }
1533 wt_longstatus_print_trailer(s);
1534 }
1535
1536 static void show_bisect_in_progress(struct wt_status *s,
1537 const char *color)
1538 {
1539 if (s->state.branch)
1540 status_printf_ln(s, color,
1541 _("You are currently bisecting, started from branch '%s'."),
1542 s->state.branch);
1543 else
1544 status_printf_ln(s, color,
1545 _("You are currently bisecting."));
1546 if (s->hints)
1547 status_printf_ln(s, color,
1548 _(" (use \"git bisect reset\" to get back to the original branch)"));
1549 wt_longstatus_print_trailer(s);
1550 }
1551
1552 static void show_sparse_checkout_in_use(struct wt_status *s,
1553 const char *color)
1554 {
1555 if (s->state.sparse_checkout_percentage == SPARSE_CHECKOUT_DISABLED)
1556 return;
1557
1558 if (s->state.sparse_checkout_percentage == SPARSE_CHECKOUT_SPARSE_INDEX)
1559 status_printf_ln(s, color, _("You are in a sparse checkout."));
1560 else
1561 status_printf_ln(s, color,
1562 _("You are in a sparse checkout with %d%% of tracked files present."),
1563 s->state.sparse_checkout_percentage);
1564 wt_longstatus_print_trailer(s);
1565 }
1566
1567 /*
1568 * Extract branch information from rebase/bisect
1569 */
1570 static char *get_branch(const struct worktree *wt, const char *path)
1571 {
1572 struct strbuf sb = STRBUF_INIT;
1573 struct object_id oid;
1574 const char *branch_name;
1575
1576 if (strbuf_read_file(&sb, worktree_git_path(wt, "%s", path), 0) <= 0)
1577 goto got_nothing;
1578
1579 while (sb.len && sb.buf[sb.len - 1] == '\n')
1580 strbuf_setlen(&sb, sb.len - 1);
1581 if (!sb.len)
1582 goto got_nothing;
1583 if (skip_prefix(sb.buf, "refs/heads/", &branch_name))
1584 strbuf_remove(&sb, 0, branch_name - sb.buf);
1585 else if (starts_with(sb.buf, "refs/"))
1586 ;
1587 else if (!get_oid_hex(sb.buf, &oid)) {
1588 strbuf_reset(&sb);
1589 strbuf_add_unique_abbrev(&sb, &oid, DEFAULT_ABBREV);
1590 } else if (!strcmp(sb.buf, "detached HEAD")) /* rebase */
1591 goto got_nothing;
1592 else /* bisect */
1593 ;
1594 return strbuf_detach(&sb, NULL);
1595
1596 got_nothing:
1597 strbuf_release(&sb);
1598 return NULL;
1599 }
1600
1601 struct grab_1st_switch_cbdata {
1602 struct strbuf buf;
1603 struct object_id noid;
1604 };
1605
1606 static int grab_1st_switch(struct object_id *ooid, struct object_id *noid,
1607 const char *email, timestamp_t timestamp, int tz,
1608 const char *message, void *cb_data)
1609 {
1610 struct grab_1st_switch_cbdata *cb = cb_data;
1611 const char *target = NULL, *end;
1612
1613 if (!skip_prefix(message, "checkout: moving from ", &message))
1614 return 0;
1615 target = strstr(message, " to ");
1616 if (!target)
1617 return 0;
1618 target += strlen(" to ");
1619 strbuf_reset(&cb->buf);
1620 oidcpy(&cb->noid, noid);
1621 end = strchrnul(target, '\n');
1622 strbuf_add(&cb->buf, target, end - target);
1623 if (!strcmp(cb->buf.buf, "HEAD")) {
1624 /* HEAD is relative. Resolve it to the right reflog entry. */
1625 strbuf_reset(&cb->buf);
1626 strbuf_add_unique_abbrev(&cb->buf, noid, DEFAULT_ABBREV);
1627 }
1628 return 1;
1629 }
1630
1631 static void wt_status_get_detached_from(struct repository *r,
1632 struct wt_status_state *state)
1633 {
1634 struct grab_1st_switch_cbdata cb;
1635 struct commit *commit;
1636 struct object_id oid;
1637 char *ref = NULL;
1638
1639 strbuf_init(&cb.buf, 0);
1640 if (for_each_reflog_ent_reverse("HEAD", grab_1st_switch, &cb) <= 0) {
1641 strbuf_release(&cb.buf);
1642 return;
1643 }
1644
1645 if (dwim_ref(cb.buf.buf, cb.buf.len, &oid, &ref, 1) == 1 &&
1646 /* oid is a commit? match without further lookup */
1647 (oideq(&cb.noid, &oid) ||
1648 /* perhaps oid is a tag, try to dereference to a commit */
1649 ((commit = lookup_commit_reference_gently(r, &oid, 1)) != NULL &&
1650 oideq(&cb.noid, &commit->object.oid)))) {
1651 const char *from = ref;
1652 if (!skip_prefix(from, "refs/tags/", &from))
1653 skip_prefix(from, "refs/remotes/", &from);
1654 state->detached_from = xstrdup(from);
1655 } else
1656 state->detached_from =
1657 xstrdup(find_unique_abbrev(&cb.noid, DEFAULT_ABBREV));
1658 oidcpy(&state->detached_oid, &cb.noid);
1659 state->detached_at = !get_oid("HEAD", &oid) &&
1660 oideq(&oid, &state->detached_oid);
1661
1662 free(ref);
1663 strbuf_release(&cb.buf);
1664 }
1665
1666 int wt_status_check_rebase(const struct worktree *wt,
1667 struct wt_status_state *state)
1668 {
1669 struct stat st;
1670
1671 if (!stat(worktree_git_path(wt, "rebase-apply"), &st)) {
1672 if (!stat(worktree_git_path(wt, "rebase-apply/applying"), &st)) {
1673 state->am_in_progress = 1;
1674 if (!stat(worktree_git_path(wt, "rebase-apply/patch"), &st) && !st.st_size)
1675 state->am_empty_patch = 1;
1676 } else {
1677 state->rebase_in_progress = 1;
1678 state->branch = get_branch(wt, "rebase-apply/head-name");
1679 state->onto = get_branch(wt, "rebase-apply/onto");
1680 }
1681 } else if (!stat(worktree_git_path(wt, "rebase-merge"), &st)) {
1682 if (!stat(worktree_git_path(wt, "rebase-merge/interactive"), &st))
1683 state->rebase_interactive_in_progress = 1;
1684 else
1685 state->rebase_in_progress = 1;
1686 state->branch = get_branch(wt, "rebase-merge/head-name");
1687 state->onto = get_branch(wt, "rebase-merge/onto");
1688 } else
1689 return 0;
1690 return 1;
1691 }
1692
1693 int wt_status_check_bisect(const struct worktree *wt,
1694 struct wt_status_state *state)
1695 {
1696 struct stat st;
1697
1698 if (!stat(worktree_git_path(wt, "BISECT_LOG"), &st)) {
1699 state->bisect_in_progress = 1;
1700 state->branch = get_branch(wt, "BISECT_START");
1701 return 1;
1702 }
1703 return 0;
1704 }
1705
1706 static void wt_status_check_sparse_checkout(struct repository *r,
1707 struct wt_status_state *state)
1708 {
1709 int skip_worktree = 0;
1710 int i;
1711
1712 if (!core_apply_sparse_checkout || r->index->cache_nr == 0) {
1713 /*
1714 * Don't compute percentage of checked out files if we
1715 * aren't in a sparse checkout or would get division by 0.
1716 */
1717 state->sparse_checkout_percentage = SPARSE_CHECKOUT_DISABLED;
1718 return;
1719 }
1720
1721 if (r->index->sparse_index) {
1722 state->sparse_checkout_percentage = SPARSE_CHECKOUT_SPARSE_INDEX;
1723 return;
1724 }
1725
1726 for (i = 0; i < r->index->cache_nr; i++) {
1727 struct cache_entry *ce = r->index->cache[i];
1728 if (ce_skip_worktree(ce))
1729 skip_worktree++;
1730 }
1731
1732 state->sparse_checkout_percentage =
1733 100 - (100 * skip_worktree)/r->index->cache_nr;
1734 }
1735
1736 void wt_status_get_state(struct repository *r,
1737 struct wt_status_state *state,
1738 int get_detached_from)
1739 {
1740 struct stat st;
1741 struct object_id oid;
1742 enum replay_action action;
1743
1744 if (!stat(git_path_merge_head(r), &st)) {
1745 wt_status_check_rebase(NULL, state);
1746 state->merge_in_progress = 1;
1747 } else if (wt_status_check_rebase(NULL, state)) {
1748 ; /* all set */
1749 } else if (refs_ref_exists(get_main_ref_store(r), "CHERRY_PICK_HEAD") &&
1750 !get_oid("CHERRY_PICK_HEAD", &oid)) {
1751 state->cherry_pick_in_progress = 1;
1752 oidcpy(&state->cherry_pick_head_oid, &oid);
1753 }
1754 wt_status_check_bisect(NULL, state);
1755 if (refs_ref_exists(get_main_ref_store(r), "REVERT_HEAD") &&
1756 !get_oid("REVERT_HEAD", &oid)) {
1757 state->revert_in_progress = 1;
1758 oidcpy(&state->revert_head_oid, &oid);
1759 }
1760 if (!sequencer_get_last_command(r, &action)) {
1761 if (action == REPLAY_PICK) {
1762 state->cherry_pick_in_progress = 1;
1763 oidcpy(&state->cherry_pick_head_oid, null_oid());
1764 } else {
1765 state->revert_in_progress = 1;
1766 oidcpy(&state->revert_head_oid, null_oid());
1767 }
1768 }
1769 if (get_detached_from)
1770 wt_status_get_detached_from(r, state);
1771 wt_status_check_sparse_checkout(r, state);
1772 }
1773
1774 static void wt_longstatus_print_state(struct wt_status *s)
1775 {
1776 const char *state_color = color(WT_STATUS_HEADER, s);
1777 struct wt_status_state *state = &s->state;
1778
1779 if (state->merge_in_progress) {
1780 if (state->rebase_interactive_in_progress) {
1781 show_rebase_information(s, state_color);
1782 fputs("\n", s->fp);
1783 }
1784 show_merge_in_progress(s, state_color);
1785 } else if (state->am_in_progress)
1786 show_am_in_progress(s, state_color);
1787 else if (state->rebase_in_progress || state->rebase_interactive_in_progress)
1788 show_rebase_in_progress(s, state_color);
1789 else if (state->cherry_pick_in_progress)
1790 show_cherry_pick_in_progress(s, state_color);
1791 else if (state->revert_in_progress)
1792 show_revert_in_progress(s, state_color);
1793 if (state->bisect_in_progress)
1794 show_bisect_in_progress(s, state_color);
1795
1796 if (state->sparse_checkout_percentage != SPARSE_CHECKOUT_DISABLED)
1797 show_sparse_checkout_in_use(s, state_color);
1798 }
1799
1800 static void wt_longstatus_print(struct wt_status *s)
1801 {
1802 const char *branch_color = color(WT_STATUS_ONBRANCH, s);
1803 const char *branch_status_color = color(WT_STATUS_HEADER, s);
1804
1805 if (s->branch) {
1806 const char *on_what = _("On branch ");
1807 const char *branch_name = s->branch;
1808 if (!strcmp(branch_name, "HEAD")) {
1809 branch_status_color = color(WT_STATUS_NOBRANCH, s);
1810 if (s->state.rebase_in_progress ||
1811 s->state.rebase_interactive_in_progress) {
1812 if (s->state.rebase_interactive_in_progress)
1813 on_what = _("interactive rebase in progress; onto ");
1814 else
1815 on_what = _("rebase in progress; onto ");
1816 branch_name = s->state.onto;
1817 } else if (s->state.detached_from) {
1818 branch_name = s->state.detached_from;
1819 if (s->state.detached_at)
1820 on_what = _("HEAD detached at ");
1821 else
1822 on_what = _("HEAD detached from ");
1823 } else {
1824 branch_name = "";
1825 on_what = _("Not currently on any branch.");
1826 }
1827 } else
1828 skip_prefix(branch_name, "refs/heads/", &branch_name);
1829 status_printf(s, color(WT_STATUS_HEADER, s), "%s", "");
1830 status_printf_more(s, branch_status_color, "%s", on_what);
1831 status_printf_more(s, branch_color, "%s\n", branch_name);
1832 if (!s->is_initial)
1833 wt_longstatus_print_tracking(s);
1834 }
1835
1836 wt_longstatus_print_state(s);
1837
1838 if (s->is_initial) {
1839 status_printf_ln(s, color(WT_STATUS_HEADER, s), "%s", "");
1840 status_printf_ln(s, color(WT_STATUS_HEADER, s),
1841 s->commit_template
1842 ? _("Initial commit")
1843 : _("No commits yet"));
1844 status_printf_ln(s, color(WT_STATUS_HEADER, s), "%s", "");
1845 }
1846
1847 wt_longstatus_print_updated(s);
1848 wt_longstatus_print_unmerged(s);
1849 wt_longstatus_print_changed(s);
1850 if (s->submodule_summary &&
1851 (!s->ignore_submodule_arg ||
1852 strcmp(s->ignore_submodule_arg, "all"))) {
1853 wt_longstatus_print_submodule_summary(s, 0); /* staged */
1854 wt_longstatus_print_submodule_summary(s, 1); /* unstaged */
1855 }
1856 if (s->show_untracked_files) {
1857 wt_longstatus_print_other(s, &s->untracked, _("Untracked files"), "add");
1858 if (s->show_ignored_mode)
1859 wt_longstatus_print_other(s, &s->ignored, _("Ignored files"), "add -f");
1860 if (advice_enabled(ADVICE_STATUS_U_OPTION) && 2000 < s->untracked_in_ms) {
1861 status_printf_ln(s, GIT_COLOR_NORMAL, "%s", "");
1862 status_printf_ln(s, GIT_COLOR_NORMAL,
1863 _("It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
1864 "may speed it up, but you have to be careful not to forget to add\n"
1865 "new files yourself (see 'git help status')."),
1866 s->untracked_in_ms / 1000.0);
1867 }
1868 } else if (s->committable)
1869 status_printf_ln(s, GIT_COLOR_NORMAL, _("Untracked files not listed%s"),
1870 s->hints
1871 ? _(" (use -u option to show untracked files)") : "");
1872
1873 if (s->verbose)
1874 wt_longstatus_print_verbose(s);
1875 if (!s->committable) {
1876 if (s->amend)
1877 status_printf_ln(s, GIT_COLOR_NORMAL, _("No changes"));
1878 else if (s->nowarn)
1879 ; /* nothing */
1880 else if (s->workdir_dirty) {
1881 if (s->hints)
1882 fprintf(s->fp, _("no changes added to commit "
1883 "(use \"git add\" and/or "
1884 "\"git commit -a\")\n"));
1885 else
1886 fprintf(s->fp, _("no changes added to "
1887 "commit\n"));
1888 } else if (s->untracked.nr) {
1889 if (s->hints)
1890 fprintf(s->fp, _("nothing added to commit but "
1891 "untracked files present (use "
1892 "\"git add\" to track)\n"));
1893 else
1894 fprintf(s->fp, _("nothing added to commit but "
1895 "untracked files present\n"));
1896 } else if (s->is_initial) {
1897 if (s->hints)
1898 fprintf(s->fp, _("nothing to commit (create/"
1899 "copy files and use \"git "
1900 "add\" to track)\n"));
1901 else
1902 fprintf(s->fp, _("nothing to commit\n"));
1903 } else if (!s->show_untracked_files) {
1904 if (s->hints)
1905 fprintf(s->fp, _("nothing to commit (use -u to "
1906 "show untracked files)\n"));
1907 else
1908 fprintf(s->fp, _("nothing to commit\n"));
1909 } else
1910 fprintf(s->fp, _("nothing to commit, working tree "
1911 "clean\n"));
1912 }
1913 if(s->show_stash)
1914 wt_longstatus_print_stash_summary(s);
1915 }
1916
1917 static void wt_shortstatus_unmerged(struct string_list_item *it,
1918 struct wt_status *s)
1919 {
1920 struct wt_status_change_data *d = it->util;
1921 const char *how = "??";
1922
1923 switch (d->stagemask) {
1924 case 1: how = "DD"; break; /* both deleted */
1925 case 2: how = "AU"; break; /* added by us */
1926 case 3: how = "UD"; break; /* deleted by them */
1927 case 4: how = "UA"; break; /* added by them */
1928 case 5: how = "DU"; break; /* deleted by us */
1929 case 6: how = "AA"; break; /* both added */
1930 case 7: how = "UU"; break; /* both modified */
1931 }
1932 color_fprintf(s->fp, color(WT_STATUS_UNMERGED, s), "%s", how);
1933 if (s->null_termination) {
1934 fprintf(s->fp, " %s%c", it->string, 0);
1935 } else {
1936 struct strbuf onebuf = STRBUF_INIT;
1937 const char *one;
1938 one = quote_path(it->string, s->prefix, &onebuf, QUOTE_PATH_QUOTE_SP);
1939 fprintf(s->fp, " %s\n", one);
1940 strbuf_release(&onebuf);
1941 }
1942 }
1943
1944 static void wt_shortstatus_status(struct string_list_item *it,
1945 struct wt_status *s)
1946 {
1947 struct wt_status_change_data *d = it->util;
1948
1949 if (d->index_status)
1950 color_fprintf(s->fp, color(WT_STATUS_UPDATED, s), "%c", d->index_status);
1951 else
1952 fputc(' ', s->fp);
1953 if (d->worktree_status)
1954 color_fprintf(s->fp, color(WT_STATUS_CHANGED, s), "%c", d->worktree_status);
1955 else
1956 fputc(' ', s->fp);
1957 fputc(' ', s->fp);
1958 if (s->null_termination) {
1959 fprintf(s->fp, "%s%c", it->string, 0);
1960 if (d->rename_source)
1961 fprintf(s->fp, "%s%c", d->rename_source, 0);
1962 } else {
1963 struct strbuf onebuf = STRBUF_INIT;
1964 const char *one;
1965
1966 if (d->rename_source) {
1967 one = quote_path(d->rename_source, s->prefix, &onebuf,
1968 QUOTE_PATH_QUOTE_SP);
1969 fprintf(s->fp, "%s -> ", one);
1970 strbuf_release(&onebuf);
1971 }
1972 one = quote_path(it->string, s->prefix, &onebuf, QUOTE_PATH_QUOTE_SP);
1973 fprintf(s->fp, "%s\n", one);
1974 strbuf_release(&onebuf);
1975 }
1976 }
1977
1978 static void wt_shortstatus_other(struct string_list_item *it,
1979 struct wt_status *s, const char *sign)
1980 {
1981 if (s->null_termination) {
1982 fprintf(s->fp, "%s %s%c", sign, it->string, 0);
1983 } else {
1984 struct strbuf onebuf = STRBUF_INIT;
1985 const char *one;
1986 one = quote_path(it->string, s->prefix, &onebuf, QUOTE_PATH_QUOTE_SP);
1987 color_fprintf(s->fp, color(WT_STATUS_UNTRACKED, s), "%s", sign);
1988 fprintf(s->fp, " %s\n", one);
1989 strbuf_release(&onebuf);
1990 }
1991 }
1992
1993 static void wt_shortstatus_print_tracking(struct wt_status *s)
1994 {
1995 struct branch *branch;
1996 const char *header_color = color(WT_STATUS_HEADER, s);
1997 const char *branch_color_local = color(WT_STATUS_LOCAL_BRANCH, s);
1998 const char *branch_color_remote = color(WT_STATUS_REMOTE_BRANCH, s);
1999
2000 const char *base;
2001 char *short_base;
2002 const char *branch_name;
2003 int num_ours, num_theirs, sti;
2004 int upstream_is_gone = 0;
2005
2006 color_fprintf(s->fp, color(WT_STATUS_HEADER, s), "## ");
2007
2008 if (!s->branch)
2009 return;
2010 branch_name = s->branch;
2011
2012 #define LABEL(string) (s->no_gettext ? (string) : _(string))
2013
2014 if (s->is_initial)
2015 color_fprintf(s->fp, header_color, LABEL(N_("No commits yet on ")));
2016
2017 if (!strcmp(s->branch, "HEAD")) {
2018 color_fprintf(s->fp, color(WT_STATUS_NOBRANCH, s), "%s",
2019 LABEL(N_("HEAD (no branch)")));
2020 goto conclude;
2021 }
2022
2023 skip_prefix(branch_name, "refs/heads/", &branch_name);
2024
2025 branch = branch_get(branch_name);
2026
2027 color_fprintf(s->fp, branch_color_local, "%s", branch_name);
2028
2029 sti = stat_tracking_info(branch, &num_ours, &num_theirs, &base,
2030 0, s->ahead_behind_flags);
2031 if (sti < 0) {
2032 if (!base)
2033 goto conclude;
2034
2035 upstream_is_gone = 1;
2036 }
2037
2038 short_base = shorten_unambiguous_ref(base, 0);
2039 color_fprintf(s->fp, header_color, "...");
2040 color_fprintf(s->fp, branch_color_remote, "%s", short_base);
2041 free(short_base);
2042
2043 if (!upstream_is_gone && !sti)
2044 goto conclude;
2045
2046 color_fprintf(s->fp, header_color, " [");
2047 if (upstream_is_gone) {
2048 color_fprintf(s->fp, header_color, LABEL(N_("gone")));
2049 } else if (s->ahead_behind_flags == AHEAD_BEHIND_QUICK) {
2050 color_fprintf(s->fp, header_color, LABEL(N_("different")));
2051 } else if (!num_ours) {
2052 color_fprintf(s->fp, header_color, LABEL(N_("behind ")));
2053 color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
2054 } else if (!num_theirs) {
2055 color_fprintf(s->fp, header_color, LABEL(N_("ahead ")));
2056 color_fprintf(s->fp, branch_color_local, "%d", num_ours);
2057 } else {
2058 color_fprintf(s->fp, header_color, LABEL(N_("ahead ")));
2059 color_fprintf(s->fp, branch_color_local, "%d", num_ours);
2060 color_fprintf(s->fp, header_color, ", %s", LABEL(N_("behind ")));
2061 color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
2062 }
2063
2064 color_fprintf(s->fp, header_color, "]");
2065 conclude:
2066 fputc(s->null_termination ? '\0' : '\n', s->fp);
2067 }
2068
2069 static void wt_shortstatus_print(struct wt_status *s)
2070 {
2071 struct string_list_item *it;
2072
2073 if (s->show_branch)
2074 wt_shortstatus_print_tracking(s);
2075
2076 for_each_string_list_item(it, &s->change) {
2077 struct wt_status_change_data *d = it->util;
2078
2079 if (d->stagemask)
2080 wt_shortstatus_unmerged(it, s);
2081 else
2082 wt_shortstatus_status(it, s);
2083 }
2084 for_each_string_list_item(it, &s->untracked)
2085 wt_shortstatus_other(it, s, "??");
2086
2087 for_each_string_list_item(it, &s->ignored)
2088 wt_shortstatus_other(it, s, "!!");
2089 }
2090
2091 static void wt_porcelain_print(struct wt_status *s)
2092 {
2093 s->use_color = 0;
2094 s->relative_paths = 0;
2095 s->prefix = NULL;
2096 s->no_gettext = 1;
2097 wt_shortstatus_print(s);
2098 }
2099
2100 /*
2101 * Print branch information for porcelain v2 output. These lines
2102 * are printed when the '--branch' parameter is given.
2103 *
2104 * # branch.oid <commit><eol>
2105 * # branch.head <head><eol>
2106 * [# branch.upstream <upstream><eol>
2107 * [# branch.ab +<ahead> -<behind><eol>]]
2108 *
2109 * <commit> ::= the current commit hash or the literal
2110 * "(initial)" to indicate an initialized repo
2111 * with no commits.
2112 *
2113 * <head> ::= <branch_name> the current branch name or
2114 * "(detached)" literal when detached head or
2115 * "(unknown)" when something is wrong.
2116 *
2117 * <upstream> ::= the upstream branch name, when set.
2118 *
2119 * <ahead> ::= integer ahead value or '?'.
2120 *
2121 * <behind> ::= integer behind value or '?'.
2122 *
2123 * The end-of-line is defined by the -z flag.
2124 *
2125 * <eol> ::= NUL when -z,
2126 * LF when NOT -z.
2127 *
2128 * When an upstream is set and present, the 'branch.ab' line will
2129 * be printed with the ahead/behind counts for the branch and the
2130 * upstream. When AHEAD_BEHIND_QUICK is requested and the branches
2131 * are different, '?' will be substituted for the actual count.
2132 */
2133 static void wt_porcelain_v2_print_tracking(struct wt_status *s)
2134 {
2135 struct branch *branch;
2136 const char *base;
2137 const char *branch_name;
2138 int ab_info, nr_ahead, nr_behind;
2139 char eol = s->null_termination ? '\0' : '\n';
2140
2141 fprintf(s->fp, "# branch.oid %s%c",
2142 (s->is_initial ? "(initial)" : oid_to_hex(&s->oid_commit)),
2143 eol);
2144
2145 if (!s->branch)
2146 fprintf(s->fp, "# branch.head %s%c", "(unknown)", eol);
2147 else {
2148 if (!strcmp(s->branch, "HEAD")) {
2149 fprintf(s->fp, "# branch.head %s%c", "(detached)", eol);
2150
2151 if (s->state.rebase_in_progress ||
2152 s->state.rebase_interactive_in_progress)
2153 branch_name = s->state.onto;
2154 else if (s->state.detached_from)
2155 branch_name = s->state.detached_from;
2156 else
2157 branch_name = "";
2158 } else {
2159 branch_name = NULL;
2160 skip_prefix(s->branch, "refs/heads/", &branch_name);
2161
2162 fprintf(s->fp, "# branch.head %s%c", branch_name, eol);
2163 }
2164
2165 /* Lookup stats on the upstream tracking branch, if set. */
2166 branch = branch_get(branch_name);
2167 base = NULL;
2168 ab_info = stat_tracking_info(branch, &nr_ahead, &nr_behind,
2169 &base, 0, s->ahead_behind_flags);
2170 if (base) {
2171 base = shorten_unambiguous_ref(base, 0);
2172 fprintf(s->fp, "# branch.upstream %s%c", base, eol);
2173 free((char *)base);
2174
2175 if (ab_info > 0) {
2176 /* different */
2177 if (nr_ahead || nr_behind)
2178 fprintf(s->fp, "# branch.ab +%d -%d%c",
2179 nr_ahead, nr_behind, eol);
2180 else
2181 fprintf(s->fp, "# branch.ab +? -?%c",
2182 eol);
2183 } else if (!ab_info) {
2184 /* same */
2185 fprintf(s->fp, "# branch.ab +0 -0%c", eol);
2186 }
2187 }
2188 }
2189 }
2190
2191 /*
2192 * Print the stash count in a porcelain-friendly format
2193 */
2194 static void wt_porcelain_v2_print_stash(struct wt_status *s)
2195 {
2196 int stash_count = count_stash_entries();
2197 char eol = s->null_termination ? '\0' : '\n';
2198
2199 if (stash_count > 0)
2200 fprintf(s->fp, "# stash %d%c", stash_count, eol);
2201 }
2202
2203 /*
2204 * Convert various submodule status values into a
2205 * fixed-length string of characters in the buffer provided.
2206 */
2207 static void wt_porcelain_v2_submodule_state(
2208 struct wt_status_change_data *d,
2209 char sub[5])
2210 {
2211 if (S_ISGITLINK(d->mode_head) ||
2212 S_ISGITLINK(d->mode_index) ||
2213 S_ISGITLINK(d->mode_worktree)) {
2214 sub[0] = 'S';
2215 sub[1] = d->new_submodule_commits ? 'C' : '.';
2216 sub[2] = (d->dirty_submodule & DIRTY_SUBMODULE_MODIFIED) ? 'M' : '.';
2217 sub[3] = (d->dirty_submodule & DIRTY_SUBMODULE_UNTRACKED) ? 'U' : '.';
2218 } else {
2219 sub[0] = 'N';
2220 sub[1] = '.';
2221 sub[2] = '.';
2222 sub[3] = '.';
2223 }
2224 sub[4] = 0;
2225 }
2226
2227 /*
2228 * Fix-up changed entries before we print them.
2229 */
2230 static void wt_porcelain_v2_fix_up_changed(struct string_list_item *it)
2231 {
2232 struct wt_status_change_data *d = it->util;
2233
2234 if (!d->index_status) {
2235 /*
2236 * This entry is unchanged in the index (relative to the head).
2237 * Therefore, the collect_updated_cb was never called for this
2238 * entry (during the head-vs-index scan) and so the head column
2239 * fields were never set.
2240 *
2241 * We must have data for the index column (from the
2242 * index-vs-worktree scan (otherwise, this entry should not be
2243 * in the list of changes)).
2244 *
2245 * Copy index column fields to the head column, so that our
2246 * output looks complete.
2247 */
2248 assert(d->mode_head == 0);
2249 d->mode_head = d->mode_index;
2250 oidcpy(&d->oid_head, &d->oid_index);
2251 }
2252
2253 if (!d->worktree_status) {
2254 /*
2255 * This entry is unchanged in the worktree (relative to the index).
2256 * Therefore, the collect_changed_cb was never called for this entry
2257 * (during the index-vs-worktree scan) and so the worktree column
2258 * fields were never set.
2259 *
2260 * We must have data for the index column (from the head-vs-index
2261 * scan).
2262 *
2263 * Copy the index column fields to the worktree column so that
2264 * our output looks complete.
2265 *
2266 * Note that we only have a mode field in the worktree column
2267 * because the scan code tries really hard to not have to compute it.
2268 */
2269 assert(d->mode_worktree == 0);
2270 d->mode_worktree = d->mode_index;
2271 }
2272 }
2273
2274 /*
2275 * Print porcelain v2 info for tracked entries with changes.
2276 */
2277 static void wt_porcelain_v2_print_changed_entry(
2278 struct string_list_item *it,
2279 struct wt_status *s)
2280 {
2281 struct wt_status_change_data *d = it->util;
2282 struct strbuf buf = STRBUF_INIT;
2283 struct strbuf buf_from = STRBUF_INIT;
2284 const char *path = NULL;
2285 const char *path_from = NULL;
2286 char key[3];
2287 char submodule_token[5];
2288 char sep_char, eol_char;
2289
2290 wt_porcelain_v2_fix_up_changed(it);
2291 wt_porcelain_v2_submodule_state(d, submodule_token);
2292
2293 key[0] = d->index_status ? d->index_status : '.';
2294 key[1] = d->worktree_status ? d->worktree_status : '.';
2295 key[2] = 0;
2296
2297 if (s->null_termination) {
2298 /*
2299 * In -z mode, we DO NOT C-quote pathnames. Current path is ALWAYS first.
2300 * A single NUL character separates them.
2301 */
2302 sep_char = '\0';
2303 eol_char = '\0';
2304 path = it->string;
2305 path_from = d->rename_source;
2306 } else {
2307 /*
2308 * Path(s) are C-quoted if necessary. Current path is ALWAYS first.
2309 * The source path is only present when necessary.
2310 * A single TAB separates them (because paths can contain spaces
2311 * which are not escaped and C-quoting does escape TAB characters).
2312 */
2313 sep_char = '\t';
2314 eol_char = '\n';
2315 path = quote_path(it->string, s->prefix, &buf, 0);
2316 if (d->rename_source)
2317 path_from = quote_path(d->rename_source, s->prefix, &buf_from, 0);
2318 }
2319
2320 if (path_from)
2321 fprintf(s->fp, "2 %s %s %06o %06o %06o %s %s %c%d %s%c%s%c",
2322 key, submodule_token,
2323 d->mode_head, d->mode_index, d->mode_worktree,
2324 oid_to_hex(&d->oid_head), oid_to_hex(&d->oid_index),
2325 d->rename_status, d->rename_score,
2326 path, sep_char, path_from, eol_char);
2327 else
2328 fprintf(s->fp, "1 %s %s %06o %06o %06o %s %s %s%c",
2329 key, submodule_token,
2330 d->mode_head, d->mode_index, d->mode_worktree,
2331 oid_to_hex(&d->oid_head), oid_to_hex(&d->oid_index),
2332 path, eol_char);
2333
2334 strbuf_release(&buf);
2335 strbuf_release(&buf_from);
2336 }
2337
2338 /*
2339 * Print porcelain v2 status info for unmerged entries.
2340 */
2341 static void wt_porcelain_v2_print_unmerged_entry(
2342 struct string_list_item *it,
2343 struct wt_status *s)
2344 {
2345 struct wt_status_change_data *d = it->util;
2346 struct index_state *istate = s->repo->index;
2347 const struct cache_entry *ce;
2348 struct strbuf buf_index = STRBUF_INIT;
2349 const char *path_index = NULL;
2350 int pos, stage, sum;
2351 struct {
2352 int mode;
2353 struct object_id oid;
2354 } stages[3];
2355 char *key;
2356 char submodule_token[5];
2357 char unmerged_prefix = 'u';
2358 char eol_char = s->null_termination ? '\0' : '\n';
2359
2360 wt_porcelain_v2_submodule_state(d, submodule_token);
2361
2362 switch (d->stagemask) {
2363 case 1: key = "DD"; break; /* both deleted */
2364 case 2: key = "AU"; break; /* added by us */
2365 case 3: key = "UD"; break; /* deleted by them */
2366 case 4: key = "UA"; break; /* added by them */
2367 case 5: key = "DU"; break; /* deleted by us */
2368 case 6: key = "AA"; break; /* both added */
2369 case 7: key = "UU"; break; /* both modified */
2370 default:
2371 BUG("unhandled unmerged status %x", d->stagemask);
2372 }
2373
2374 /*
2375 * Disregard d.aux.porcelain_v2 data that we accumulated
2376 * for the head and index columns during the scans and
2377 * replace with the actual stage data.
2378 *
2379 * Note that this is a last-one-wins for each the individual
2380 * stage [123] columns in the event of multiple cache entries
2381 * for same stage.
2382 */
2383 memset(stages, 0, sizeof(stages));
2384 sum = 0;
2385 pos = index_name_pos(istate, it->string, strlen(it->string));
2386 assert(pos < 0);
2387 pos = -pos-1;
2388 while (pos < istate->cache_nr) {
2389 ce = istate->cache[pos++];
2390 stage = ce_stage(ce);
2391 if (strcmp(ce->name, it->string) || !stage)
2392 break;
2393 stages[stage - 1].mode = ce->ce_mode;
2394 oidcpy(&stages[stage - 1].oid, &ce->oid);
2395 sum |= (1 << (stage - 1));
2396 }
2397 if (sum != d->stagemask)
2398 BUG("observed stagemask 0x%x != expected stagemask 0x%x", sum, d->stagemask);
2399
2400 if (s->null_termination)
2401 path_index = it->string;
2402 else
2403 path_index = quote_path(it->string, s->prefix, &buf_index, 0);
2404
2405 fprintf(s->fp, "%c %s %s %06o %06o %06o %06o %s %s %s %s%c",
2406 unmerged_prefix, key, submodule_token,
2407 stages[0].mode, /* stage 1 */
2408 stages[1].mode, /* stage 2 */
2409 stages[2].mode, /* stage 3 */
2410 d->mode_worktree,
2411 oid_to_hex(&stages[0].oid), /* stage 1 */
2412 oid_to_hex(&stages[1].oid), /* stage 2 */
2413 oid_to_hex(&stages[2].oid), /* stage 3 */
2414 path_index,
2415 eol_char);
2416
2417 strbuf_release(&buf_index);
2418 }
2419
2420 /*
2421 * Print porcelain V2 status info for untracked and ignored entries.
2422 */
2423 static void wt_porcelain_v2_print_other(
2424 struct string_list_item *it,
2425 struct wt_status *s,
2426 char prefix)
2427 {
2428 struct strbuf buf = STRBUF_INIT;
2429 const char *path;
2430 char eol_char;
2431
2432 if (s->null_termination) {
2433 path = it->string;
2434 eol_char = '\0';
2435 } else {
2436 path = quote_path(it->string, s->prefix, &buf, 0);
2437 eol_char = '\n';
2438 }
2439
2440 fprintf(s->fp, "%c %s%c", prefix, path, eol_char);
2441
2442 strbuf_release(&buf);
2443 }
2444
2445 /*
2446 * Print porcelain V2 status.
2447 *
2448 * [<v2_branch>]
2449 * [<v2_changed_items>]*
2450 * [<v2_unmerged_items>]*
2451 * [<v2_untracked_items>]*
2452 * [<v2_ignored_items>]*
2453 *
2454 */
2455 static void wt_porcelain_v2_print(struct wt_status *s)
2456 {
2457 struct wt_status_change_data *d;
2458 struct string_list_item *it;
2459 int i;
2460
2461 if (s->show_branch)
2462 wt_porcelain_v2_print_tracking(s);
2463
2464 if (s->show_stash)
2465 wt_porcelain_v2_print_stash(s);
2466
2467 for (i = 0; i < s->change.nr; i++) {
2468 it = &(s->change.items[i]);
2469 d = it->util;
2470 if (!d->stagemask)
2471 wt_porcelain_v2_print_changed_entry(it, s);
2472 }
2473
2474 for (i = 0; i < s->change.nr; i++) {
2475 it = &(s->change.items[i]);
2476 d = it->util;
2477 if (d->stagemask)
2478 wt_porcelain_v2_print_unmerged_entry(it, s);
2479 }
2480
2481 for (i = 0; i < s->untracked.nr; i++) {
2482 it = &(s->untracked.items[i]);
2483 wt_porcelain_v2_print_other(it, s, '?');
2484 }
2485
2486 for (i = 0; i < s->ignored.nr; i++) {
2487 it = &(s->ignored.items[i]);
2488 wt_porcelain_v2_print_other(it, s, '!');
2489 }
2490 }
2491
2492 void wt_status_print(struct wt_status *s)
2493 {
2494 trace2_data_intmax("status", s->repo, "count/changed", s->change.nr);
2495 trace2_data_intmax("status", s->repo, "count/untracked",
2496 s->untracked.nr);
2497 trace2_data_intmax("status", s->repo, "count/ignored", s->ignored.nr);
2498
2499 trace2_region_enter("status", "print", s->repo);
2500
2501 switch (s->status_format) {
2502 case STATUS_FORMAT_SHORT:
2503 wt_shortstatus_print(s);
2504 break;
2505 case STATUS_FORMAT_PORCELAIN:
2506 wt_porcelain_print(s);
2507 break;
2508 case STATUS_FORMAT_PORCELAIN_V2:
2509 wt_porcelain_v2_print(s);
2510 break;
2511 case STATUS_FORMAT_UNSPECIFIED:
2512 BUG("finalize_deferred_config() should have been called");
2513 break;
2514 case STATUS_FORMAT_NONE:
2515 case STATUS_FORMAT_LONG:
2516 wt_longstatus_print(s);
2517 break;
2518 }
2519
2520 trace2_region_leave("status", "print", s->repo);
2521 }
2522
2523 /**
2524 * Returns 1 if there are unstaged changes, 0 otherwise.
2525 */
2526 int has_unstaged_changes(struct repository *r, int ignore_submodules)
2527 {
2528 struct rev_info rev_info;
2529 int result;
2530
2531 repo_init_revisions(r, &rev_info, NULL);
2532 if (ignore_submodules) {
2533 rev_info.diffopt.flags.ignore_submodules = 1;
2534 rev_info.diffopt.flags.override_submodule_config = 1;
2535 }
2536 rev_info.diffopt.flags.quick = 1;
2537 diff_setup_done(&rev_info.diffopt);
2538 result = run_diff_files(&rev_info, 0);
2539 return diff_result_code(&rev_info.diffopt, result);
2540 }
2541
2542 /**
2543 * Returns 1 if there are uncommitted changes, 0 otherwise.
2544 */
2545 int has_uncommitted_changes(struct repository *r,
2546 int ignore_submodules)
2547 {
2548 struct rev_info rev_info;
2549 int result;
2550
2551 if (is_index_unborn(r->index))
2552 return 0;
2553
2554 repo_init_revisions(r, &rev_info, NULL);
2555 if (ignore_submodules)
2556 rev_info.diffopt.flags.ignore_submodules = 1;
2557 rev_info.diffopt.flags.quick = 1;
2558
2559 add_head_to_pending(&rev_info);
2560 if (!rev_info.pending.nr) {
2561 /*
2562 * We have no head (or it's corrupt); use the empty tree,
2563 * which will complain if the index is non-empty.
2564 */
2565 struct tree *tree = lookup_tree(r, the_hash_algo->empty_tree);
2566 add_pending_object(&rev_info, &tree->object, "");
2567 }
2568
2569 diff_setup_done(&rev_info.diffopt);
2570 result = run_diff_index(&rev_info, 1);
2571 object_array_clear(&rev_info.pending);
2572 return diff_result_code(&rev_info.diffopt, result);
2573 }
2574
2575 /**
2576 * If the work tree has unstaged or uncommitted changes, dies with the
2577 * appropriate message.
2578 */
2579 int require_clean_work_tree(struct repository *r,
2580 const char *action,
2581 const char *hint,
2582 int ignore_submodules,
2583 int gently)
2584 {
2585 struct lock_file lock_file = LOCK_INIT;
2586 int err = 0, fd;
2587
2588 fd = repo_hold_locked_index(r, &lock_file, 0);
2589 refresh_index(r->index, REFRESH_QUIET, NULL, NULL, NULL);
2590 if (0 <= fd)
2591 repo_update_index_if_able(r, &lock_file);
2592 rollback_lock_file(&lock_file);
2593
2594 if (has_unstaged_changes(r, ignore_submodules)) {
2595 /* TRANSLATORS: the action is e.g. "pull with rebase" */
2596 error(_("cannot %s: You have unstaged changes."), _(action));
2597 err = 1;
2598 }
2599
2600 if (has_uncommitted_changes(r, ignore_submodules)) {
2601 if (err)
2602 error(_("additionally, your index contains uncommitted changes."));
2603 else
2604 error(_("cannot %s: Your index contains uncommitted changes."),
2605 _(action));
2606 err = 1;
2607 }
2608
2609 if (err) {
2610 if (hint)
2611 error("%s", hint);
2612 if (!gently)
2613 exit(128);
2614 }
2615
2616 return err;
2617 }
git for Debian