git.oblomov.eu Git - git/blob - wt-status.c

   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 she 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 void wt_status_collect_changes_initial(struct wt_status *s)
 661 {
 662         struct index_state *istate = s->repo->index;
 663         int i;
 664
 665         for (i = 0; i < istate->cache_nr; i++) {
 666                 struct string_list_item *it;
 667                 struct wt_status_change_data *d;
 668                 const struct cache_entry *ce = istate->cache[i];
 669
 670                 if (!ce_path_match(istate, ce, &s->pathspec, NULL))
 671                         continue;
 672                 if (ce_intent_to_add(ce))
 673                         continue;
 674                 it = string_list_insert(&s->change, ce->name);
 675                 d = it->util;
 676                 if (!d) {
 677                         CALLOC_ARRAY(d, 1);
 678                         it->util = d;
 679                 }
 680                 if (ce_stage(ce)) {
 681                         d->index_status = DIFF_STATUS_UNMERGED;
 682                         d->stagemask |= (1 << (ce_stage(ce) - 1));
 683                         /*
 684                          * Don't bother setting {mode,oid}_{head,index} since the print
 685                          * code will output the stage values directly and not use the
 686                          * values in these fields.
 687                          */
 688                         s->committable = 1;
 689                 } else {
 690                         d->index_status = DIFF_STATUS_ADDED;
 691                         /* Leave {mode,oid}_head zero for adds. */
 692                         d->mode_index = ce->ce_mode;
 693                         oidcpy(&d->oid_index, &ce->oid);
 694                         s->committable = 1;
 695                 }
 696         }
 697 }
 698
 699 static void wt_status_collect_untracked(struct wt_status *s)
 700 {
 701         int i;
 702         struct dir_struct dir;
 703         uint64_t t_begin = getnanotime();
 704         struct index_state *istate = s->repo->index;
 705
 706         if (!s->show_untracked_files)
 707                 return;
 708
 709         dir_init(&dir);
 710         if (s->show_untracked_files != SHOW_ALL_UNTRACKED_FILES)
 711                 dir.flags |=
 712                         DIR_SHOW_OTHER_DIRECTORIES | DIR_HIDE_EMPTY_DIRECTORIES;
 713         if (s->show_ignored_mode) {
 714                 dir.flags |= DIR_SHOW_IGNORED_TOO;
 715
 716                 if (s->show_ignored_mode == SHOW_MATCHING_IGNORED)
 717                         dir.flags |= DIR_SHOW_IGNORED_TOO_MODE_MATCHING;
 718         } else {
 719                 dir.untracked = istate->untracked;
 720         }
 721
 722         setup_standard_excludes(&dir);
 723
 724         fill_directory(&dir, istate, &s->pathspec);
 725
 726         for (i = 0; i < dir.nr; i++) {
 727                 struct dir_entry *ent = dir.entries[i];
 728                 if (index_name_is_other(istate, ent->name, ent->len))
 729                         string_list_insert(&s->untracked, ent->name);
 730         }
 731
 732         for (i = 0; i < dir.ignored_nr; i++) {
 733                 struct dir_entry *ent = dir.ignored[i];
 734                 if (index_name_is_other(istate, ent->name, ent->len))
 735                         string_list_insert(&s->ignored, ent->name);
 736         }
 737
 738         dir_clear(&dir);
 739
 740         if (advice_status_u_option)
 741                 s->untracked_in_ms = (getnanotime() - t_begin) / 1000000;
 742 }
 743
 744 static int has_unmerged(struct wt_status *s)
 745 {
 746         int i;
 747
 748         for (i = 0; i < s->change.nr; i++) {
 749                 struct wt_status_change_data *d;
 750                 d = s->change.items[i].util;
 751                 if (d->stagemask)
 752                         return 1;
 753         }
 754         return 0;
 755 }
 756
 757 void wt_status_collect(struct wt_status *s)
 758 {
 759         trace2_region_enter("status", "worktrees", s->repo);
 760         wt_status_collect_changes_worktree(s);
 761         trace2_region_leave("status", "worktrees", s->repo);
 762
 763         if (s->is_initial) {
 764                 trace2_region_enter("status", "initial", s->repo);
 765                 wt_status_collect_changes_initial(s);
 766                 trace2_region_leave("status", "initial", s->repo);
 767         } else {
 768                 trace2_region_enter("status", "index", s->repo);
 769                 wt_status_collect_changes_index(s);
 770                 trace2_region_leave("status", "index", s->repo);
 771         }
 772
 773         trace2_region_enter("status", "untracked", s->repo);
 774         wt_status_collect_untracked(s);
 775         trace2_region_leave("status", "untracked", s->repo);
 776
 777         wt_status_get_state(s->repo, &s->state, s->branch && !strcmp(s->branch, "HEAD"));
 778         if (s->state.merge_in_progress && !has_unmerged(s))
 779                 s->committable = 1;
 780 }
 781
 782 void wt_status_collect_free_buffers(struct wt_status *s)
 783 {
 784         wt_status_state_free_buffers(&s->state);
 785 }
 786
 787 void wt_status_state_free_buffers(struct wt_status_state *state)
 788 {
 789         FREE_AND_NULL(state->branch);
 790         FREE_AND_NULL(state->onto);
 791         FREE_AND_NULL(state->detached_from);
 792 }
 793
 794 static void wt_longstatus_print_unmerged(struct wt_status *s)
 795 {
 796         int shown_header = 0;
 797         int i;
 798
 799         for (i = 0; i < s->change.nr; i++) {
 800                 struct wt_status_change_data *d;
 801                 struct string_list_item *it;
 802                 it = &(s->change.items[i]);
 803                 d = it->util;
 804                 if (!d->stagemask)
 805                         continue;
 806                 if (!shown_header) {
 807                         wt_longstatus_print_unmerged_header(s);
 808                         shown_header = 1;
 809                 }
 810                 wt_longstatus_print_unmerged_data(s, it);
 811         }
 812         if (shown_header)
 813                 wt_longstatus_print_trailer(s);
 814
 815 }
 816
 817 static void wt_longstatus_print_updated(struct wt_status *s)
 818 {
 819         int shown_header = 0;
 820         int i;
 821
 822         for (i = 0; i < s->change.nr; i++) {
 823                 struct wt_status_change_data *d;
 824                 struct string_list_item *it;
 825                 it = &(s->change.items[i]);
 826                 d = it->util;
 827                 if (!d->index_status ||
 828                     d->index_status == DIFF_STATUS_UNMERGED)
 829                         continue;
 830                 if (!shown_header) {
 831                         wt_longstatus_print_cached_header(s);
 832                         shown_header = 1;
 833                 }
 834                 wt_longstatus_print_change_data(s, WT_STATUS_UPDATED, it);
 835         }
 836         if (shown_header)
 837                 wt_longstatus_print_trailer(s);
 838 }
 839
 840 /*
 841  * -1 : has delete
 842  *  0 : no change
 843  *  1 : some change but no delete
 844  */
 845 static int wt_status_check_worktree_changes(struct wt_status *s,
 846                                              int *dirty_submodules)
 847 {
 848         int i;
 849         int changes = 0;
 850
 851         *dirty_submodules = 0;
 852
 853         for (i = 0; i < s->change.nr; i++) {
 854                 struct wt_status_change_data *d;
 855                 d = s->change.items[i].util;
 856                 if (!d->worktree_status ||
 857                     d->worktree_status == DIFF_STATUS_UNMERGED)
 858                         continue;
 859                 if (!changes)
 860                         changes = 1;
 861                 if (d->dirty_submodule)
 862                         *dirty_submodules = 1;
 863                 if (d->worktree_status == DIFF_STATUS_DELETED)
 864                         changes = -1;
 865         }
 866         return changes;
 867 }
 868
 869 static void wt_longstatus_print_changed(struct wt_status *s)
 870 {
 871         int i, dirty_submodules;
 872         int worktree_changes = wt_status_check_worktree_changes(s, &dirty_submodules);
 873
 874         if (!worktree_changes)
 875                 return;
 876
 877         wt_longstatus_print_dirty_header(s, worktree_changes < 0, dirty_submodules);
 878
 879         for (i = 0; i < s->change.nr; i++) {
 880                 struct wt_status_change_data *d;
 881                 struct string_list_item *it;
 882                 it = &(s->change.items[i]);
 883                 d = it->util;
 884                 if (!d->worktree_status ||
 885                     d->worktree_status == DIFF_STATUS_UNMERGED)
 886                         continue;
 887                 wt_longstatus_print_change_data(s, WT_STATUS_CHANGED, it);
 888         }
 889         wt_longstatus_print_trailer(s);
 890 }
 891
 892 static int stash_count_refs(struct object_id *ooid, struct object_id *noid,
 893                             const char *email, timestamp_t timestamp, int tz,
 894                             const char *message, void *cb_data)
 895 {
 896         int *c = cb_data;
 897         (*c)++;
 898         return 0;
 899 }
 900
 901 static void wt_longstatus_print_stash_summary(struct wt_status *s)
 902 {
 903         int stash_count = 0;
 904
 905         for_each_reflog_ent("refs/stash", stash_count_refs, &stash_count);
 906         if (stash_count > 0)
 907                 status_printf_ln(s, GIT_COLOR_NORMAL,
 908                                  Q_("Your stash currently has %d entry",
 909                                     "Your stash currently has %d entries", stash_count),
 910                                  stash_count);
 911 }
 912
 913 static void wt_longstatus_print_submodule_summary(struct wt_status *s, int uncommitted)
 914 {
 915         struct child_process sm_summary = CHILD_PROCESS_INIT;
 916         struct strbuf cmd_stdout = STRBUF_INIT;
 917         struct strbuf summary = STRBUF_INIT;
 918         char *summary_content;
 919
 920         strvec_pushf(&sm_summary.env_array, "GIT_INDEX_FILE=%s", s->index_file);
 921
 922         strvec_push(&sm_summary.args, "submodule");
 923         strvec_push(&sm_summary.args, "summary");
 924         strvec_push(&sm_summary.args, uncommitted ? "--files" : "--cached");
 925         strvec_push(&sm_summary.args, "--for-status");
 926         strvec_push(&sm_summary.args, "--summary-limit");
 927         strvec_pushf(&sm_summary.args, "%d", s->submodule_summary);
 928         if (!uncommitted)
 929                 strvec_push(&sm_summary.args, s->amend ? "HEAD^" : "HEAD");
 930
 931         sm_summary.git_cmd = 1;
 932         sm_summary.no_stdin = 1;
 933
 934         capture_command(&sm_summary, &cmd_stdout, 1024);
 935
 936         /* prepend header, only if there's an actual output */
 937         if (cmd_stdout.len) {
 938                 if (uncommitted)
 939                         strbuf_addstr(&summary, _("Submodules changed but not updated:"));
 940                 else
 941                         strbuf_addstr(&summary, _("Submodule changes to be committed:"));
 942                 strbuf_addstr(&summary, "\n\n");
 943         }
 944         strbuf_addbuf(&summary, &cmd_stdout);
 945         strbuf_release(&cmd_stdout);
 946
 947         if (s->display_comment_prefix) {
 948                 size_t len;
 949                 summary_content = strbuf_detach(&summary, &len);
 950                 strbuf_add_commented_lines(&summary, summary_content, len);
 951                 free(summary_content);
 952         }
 953
 954         fputs(summary.buf, s->fp);
 955         strbuf_release(&summary);
 956 }
 957
 958 static void wt_longstatus_print_other(struct wt_status *s,
 959                                       struct string_list *l,
 960                                       const char *what,
 961                                       const char *how)
 962 {
 963         int i;
 964         struct strbuf buf = STRBUF_INIT;
 965         static struct string_list output = STRING_LIST_INIT_DUP;
 966         struct column_options copts;
 967
 968         if (!l->nr)
 969                 return;
 970
 971         wt_longstatus_print_other_header(s, what, how);
 972
 973         for (i = 0; i < l->nr; i++) {
 974                 struct string_list_item *it;
 975                 const char *path;
 976                 it = &(l->items[i]);
 977                 path = quote_path(it->string, s->prefix, &buf, 0);
 978                 if (column_active(s->colopts)) {
 979                         string_list_append(&output, path);
 980                         continue;
 981                 }
 982                 status_printf(s, color(WT_STATUS_HEADER, s), "\t");
 983                 status_printf_more(s, color(WT_STATUS_UNTRACKED, s),
 984                                    "%s\n", path);
 985         }
 986
 987         strbuf_release(&buf);
 988         if (!column_active(s->colopts))
 989                 goto conclude;
 990
 991         strbuf_addf(&buf, "%s%s\t%s",
 992                     color(WT_STATUS_HEADER, s),
 993                     s->display_comment_prefix ? "#" : "",
 994                     color(WT_STATUS_UNTRACKED, s));
 995         memset(&copts, 0, sizeof(copts));
 996         copts.padding = 1;
 997         copts.indent = buf.buf;
 998         if (want_color(s->use_color))
 999                 copts.nl = GIT_COLOR_RESET "\n";
1000         print_columns(&output, s->colopts, &copts);
1001         string_list_clear(&output, 0);
1002         strbuf_release(&buf);
1003 conclude:
1004         status_printf_ln(s, GIT_COLOR_NORMAL, "%s", "");
1005 }
1006
1007 size_t wt_status_locate_end(const char *s, size_t len)
1008 {
1009         const char *p;
1010         struct strbuf pattern = STRBUF_INIT;
1011
1012         strbuf_addf(&pattern, "\n%c %s", comment_line_char, cut_line);
1013         if (starts_with(s, pattern.buf + 1))
1014                 len = 0;
1015         else if ((p = strstr(s, pattern.buf)))
1016                 len = p - s + 1;
1017         strbuf_release(&pattern);
1018         return len;
1019 }
1020
1021 void wt_status_append_cut_line(struct strbuf *buf)
1022 {
1023         const char *explanation = _("Do not modify or remove the line above.\nEverything below it will be ignored.");
1024
1025         strbuf_commented_addf(buf, "%s", cut_line);
1026         strbuf_add_commented_lines(buf, explanation, strlen(explanation));
1027 }
1028
1029 void wt_status_add_cut_line(FILE *fp)
1030 {
1031         struct strbuf buf = STRBUF_INIT;
1032
1033         wt_status_append_cut_line(&buf);
1034         fputs(buf.buf, fp);
1035         strbuf_release(&buf);
1036 }
1037
1038 static void wt_longstatus_print_verbose(struct wt_status *s)
1039 {
1040         struct rev_info rev;
1041         struct setup_revision_opt opt;
1042         int dirty_submodules;
1043         const char *c = color(WT_STATUS_HEADER, s);
1044
1045         repo_init_revisions(s->repo, &rev, NULL);
1046         rev.diffopt.flags.allow_textconv = 1;
1047         rev.diffopt.ita_invisible_in_index = 1;
1048
1049         memset(&opt, 0, sizeof(opt));
1050         opt.def = s->is_initial ? empty_tree_oid_hex() : s->reference;
1051         setup_revisions(0, NULL, &rev, &opt);
1052
1053         rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
1054         rev.diffopt.detect_rename = s->detect_rename >= 0 ? s->detect_rename : rev.diffopt.detect_rename;
1055         rev.diffopt.rename_limit = s->rename_limit >= 0 ? s->rename_limit : rev.diffopt.rename_limit;
1056         rev.diffopt.rename_score = s->rename_score >= 0 ? s->rename_score : rev.diffopt.rename_score;
1057         rev.diffopt.file = s->fp;
1058         rev.diffopt.close_file = 0;
1059         /*
1060          * If we're not going to stdout, then we definitely don't
1061          * want color, since we are going to the commit message
1062          * file (and even the "auto" setting won't work, since it
1063          * will have checked isatty on stdout). But we then do want
1064          * to insert the scissor line here to reliably remove the
1065          * diff before committing.
1066          */
1067         if (s->fp != stdout) {
1068                 rev.diffopt.use_color = 0;
1069                 wt_status_add_cut_line(s->fp);
1070         }
1071         if (s->verbose > 1 && s->committable) {
1072                 /* print_updated() printed a header, so do we */
1073                 if (s->fp != stdout)
1074                         wt_longstatus_print_trailer(s);
1075                 status_printf_ln(s, c, _("Changes to be committed:"));
1076                 rev.diffopt.a_prefix = "c/";
1077                 rev.diffopt.b_prefix = "i/";
1078         } /* else use prefix as per user config */
1079         run_diff_index(&rev, 1);
1080         if (s->verbose > 1 &&
1081             wt_status_check_worktree_changes(s, &dirty_submodules)) {
1082                 status_printf_ln(s, c,
1083                         "--------------------------------------------------");
1084                 status_printf_ln(s, c, _("Changes not staged for commit:"));
1085                 setup_work_tree();
1086                 rev.diffopt.a_prefix = "i/";
1087                 rev.diffopt.b_prefix = "w/";
1088                 run_diff_files(&rev, 0);
1089         }
1090 }
1091
1092 static void wt_longstatus_print_tracking(struct wt_status *s)
1093 {
1094         struct strbuf sb = STRBUF_INIT;
1095         const char *cp, *ep, *branch_name;
1096         struct branch *branch;
1097         char comment_line_string[3];
1098         int i;
1099         uint64_t t_begin = 0;
1100
1101         assert(s->branch && !s->is_initial);
1102         if (!skip_prefix(s->branch, "refs/heads/", &branch_name))
1103                 return;
1104         branch = branch_get(branch_name);
1105
1106         t_begin = getnanotime();
1107
1108         if (!format_tracking_info(branch, &sb, s->ahead_behind_flags))
1109                 return;
1110
1111         if (advice_status_ahead_behind_warning &&
1112             s->ahead_behind_flags == AHEAD_BEHIND_FULL) {
1113                 uint64_t t_delta_in_ms = (getnanotime() - t_begin) / 1000000;
1114                 if (t_delta_in_ms > AB_DELAY_WARNING_IN_MS) {
1115                         strbuf_addf(&sb, _("\n"
1116                                            "It took %.2f seconds to compute the branch ahead/behind values.\n"
1117                                            "You can use '--no-ahead-behind' to avoid this.\n"),
1118                                     t_delta_in_ms / 1000.0);
1119                 }
1120         }
1121
1122         i = 0;
1123         if (s->display_comment_prefix) {
1124                 comment_line_string[i++] = comment_line_char;
1125                 comment_line_string[i++] = ' ';
1126         }
1127         comment_line_string[i] = '\0';
1128
1129         for (cp = sb.buf; (ep = strchr(cp, '\n')) != NULL; cp = ep + 1)
1130                 color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s),
1131                                  "%s%.*s", comment_line_string,
1132                                  (int)(ep - cp), cp);
1133         if (s->display_comment_prefix)
1134                 color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s), "%c",
1135                                  comment_line_char);
1136         else
1137                 fputs("\n", s->fp);
1138         strbuf_release(&sb);
1139 }
1140
1141 static void show_merge_in_progress(struct wt_status *s,
1142                                    const char *color)
1143 {
1144         if (has_unmerged(s)) {
1145                 status_printf_ln(s, color, _("You have unmerged paths."));
1146                 if (s->hints) {
1147                         status_printf_ln(s, color,
1148                                          _("  (fix conflicts and run \"git commit\")"));
1149                         status_printf_ln(s, color,
1150                                          _("  (use \"git merge --abort\" to abort the merge)"));
1151                 }
1152         } else {
1153                 status_printf_ln(s, color,
1154                         _("All conflicts fixed but you are still merging."));
1155                 if (s->hints)
1156                         status_printf_ln(s, color,
1157                                 _("  (use \"git commit\" to conclude merge)"));
1158         }
1159         wt_longstatus_print_trailer(s);
1160 }
1161
1162 static void show_am_in_progress(struct wt_status *s,
1163                                 const char *color)
1164 {
1165         status_printf_ln(s, color,
1166                 _("You are in the middle of an am session."));
1167         if (s->state.am_empty_patch)
1168                 status_printf_ln(s, color,
1169                         _("The current patch is empty."));
1170         if (s->hints) {
1171                 if (!s->state.am_empty_patch)
1172                         status_printf_ln(s, color,
1173                                 _("  (fix conflicts and then run \"git am --continue\")"));
1174                 status_printf_ln(s, color,
1175                         _("  (use \"git am --skip\" to skip this patch)"));
1176                 status_printf_ln(s, color,
1177                         _("  (use \"git am --abort\" to restore the original branch)"));
1178         }
1179         wt_longstatus_print_trailer(s);
1180 }
1181
1182 static char *read_line_from_git_path(const char *filename)
1183 {
1184         struct strbuf buf = STRBUF_INIT;
1185         FILE *fp = fopen_or_warn(git_path("%s", filename), "r");
1186
1187         if (!fp) {
1188                 strbuf_release(&buf);
1189                 return NULL;
1190         }
1191         strbuf_getline_lf(&buf, fp);
1192         if (!fclose(fp)) {
1193                 return strbuf_detach(&buf, NULL);
1194         } else {
1195                 strbuf_release(&buf);
1196                 return NULL;
1197         }
1198 }
1199
1200 static int split_commit_in_progress(struct wt_status *s)
1201 {
1202         int split_in_progress = 0;
1203         char *head, *orig_head, *rebase_amend, *rebase_orig_head;
1204
1205         if ((!s->amend && !s->nowarn && !s->workdir_dirty) ||
1206             !s->branch || strcmp(s->branch, "HEAD"))
1207                 return 0;
1208
1209         head = read_line_from_git_path("HEAD");
1210         orig_head = read_line_from_git_path("ORIG_HEAD");
1211         rebase_amend = read_line_from_git_path("rebase-merge/amend");
1212         rebase_orig_head = read_line_from_git_path("rebase-merge/orig-head");
1213
1214         if (!head || !orig_head || !rebase_amend || !rebase_orig_head)
1215                 ; /* fall through, no split in progress */
1216         else if (!strcmp(rebase_amend, rebase_orig_head))
1217                 split_in_progress = !!strcmp(head, rebase_amend);
1218         else if (strcmp(orig_head, rebase_orig_head))
1219                 split_in_progress = 1;
1220
1221         free(head);
1222         free(orig_head);
1223         free(rebase_amend);
1224         free(rebase_orig_head);
1225
1226         return split_in_progress;
1227 }
1228
1229 /*
1230  * Turn
1231  * "pick d6a2f0303e897ec257dd0e0a39a5ccb709bc2047 some message"
1232  * into
1233  * "pick d6a2f03 some message"
1234  *
1235  * The function assumes that the line does not contain useless spaces
1236  * before or after the command.
1237  */
1238 static void abbrev_oid_in_line(struct strbuf *line)
1239 {
1240         struct strbuf **split;
1241         int i;
1242
1243         if (starts_with(line->buf, "exec ") ||
1244             starts_with(line->buf, "x ") ||
1245             starts_with(line->buf, "label ") ||
1246             starts_with(line->buf, "l "))
1247                 return;
1248
1249         split = strbuf_split_max(line, ' ', 3);
1250         if (split[0] && split[1]) {
1251                 struct object_id oid;
1252
1253                 /*
1254                  * strbuf_split_max left a space. Trim it and re-add
1255                  * it after abbreviation.
1256                  */
1257                 strbuf_trim(split[1]);
1258                 if (!get_oid(split[1]->buf, &oid)) {
1259                         strbuf_reset(split[1]);
1260                         strbuf_add_unique_abbrev(split[1], &oid,
1261                                                  DEFAULT_ABBREV);
1262                         strbuf_addch(split[1], ' ');
1263                         strbuf_reset(line);
1264                         for (i = 0; split[i]; i++)
1265                                 strbuf_addbuf(line, split[i]);
1266                 }
1267         }
1268         strbuf_list_free(split);
1269 }
1270
1271 static int read_rebase_todolist(const char *fname, struct string_list *lines)
1272 {
1273         struct strbuf line = STRBUF_INIT;
1274         FILE *f = fopen(git_path("%s", fname), "r");
1275
1276         if (!f) {
1277                 if (errno == ENOENT)
1278                         return -1;
1279                 die_errno("Could not open file %s for reading",
1280                           git_path("%s", fname));
1281         }
1282         while (!strbuf_getline_lf(&line, f)) {
1283                 if (line.len && line.buf[0] == comment_line_char)
1284                         continue;
1285                 strbuf_trim(&line);
1286                 if (!line.len)
1287                         continue;
1288                 abbrev_oid_in_line(&line);
1289                 string_list_append(lines, line.buf);
1290         }
1291         fclose(f);
1292         strbuf_release(&line);
1293         return 0;
1294 }
1295
1296 static void show_rebase_information(struct wt_status *s,
1297                                     const char *color)
1298 {
1299         if (s->state.rebase_interactive_in_progress) {
1300                 int i;
1301                 int nr_lines_to_show = 2;
1302
1303                 struct string_list have_done = STRING_LIST_INIT_DUP;
1304                 struct string_list yet_to_do = STRING_LIST_INIT_DUP;
1305
1306                 read_rebase_todolist("rebase-merge/done", &have_done);
1307                 if (read_rebase_todolist("rebase-merge/git-rebase-todo",
1308                                          &yet_to_do))
1309                         status_printf_ln(s, color,
1310                                 _("git-rebase-todo is missing."));
1311                 if (have_done.nr == 0)
1312                         status_printf_ln(s, color, _("No commands done."));
1313                 else {
1314                         status_printf_ln(s, color,
1315                                 Q_("Last command done (%d command done):",
1316                                         "Last commands done (%d commands done):",
1317                                         have_done.nr),
1318                                 have_done.nr);
1319                         for (i = (have_done.nr > nr_lines_to_show)
1320                                 ? have_done.nr - nr_lines_to_show : 0;
1321                                 i < have_done.nr;
1322                                 i++)
1323                                 status_printf_ln(s, color, "   %s", have_done.items[i].string);
1324                         if (have_done.nr > nr_lines_to_show && s->hints)
1325                                 status_printf_ln(s, color,
1326                                         _("  (see more in file %s)"), git_path("rebase-merge/done"));
1327                 }
1328
1329                 if (yet_to_do.nr == 0)
1330                         status_printf_ln(s, color,
1331                                          _("No commands remaining."));
1332                 else {
1333                         status_printf_ln(s, color,
1334                                 Q_("Next command to do (%d remaining command):",
1335                                         "Next commands to do (%d remaining commands):",
1336                                         yet_to_do.nr),
1337                                 yet_to_do.nr);
1338                         for (i = 0; i < nr_lines_to_show && i < yet_to_do.nr; i++)
1339                                 status_printf_ln(s, color, "   %s", yet_to_do.items[i].string);
1340                         if (s->hints)
1341                                 status_printf_ln(s, color,
1342                                         _("  (use \"git rebase --edit-todo\" to view and edit)"));
1343                 }
1344                 string_list_clear(&yet_to_do, 0);
1345                 string_list_clear(&have_done, 0);
1346         }
1347 }
1348
1349 static void print_rebase_state(struct wt_status *s,
1350                                const char *color)
1351 {
1352         if (s->state.branch)
1353                 status_printf_ln(s, color,
1354                                  _("You are currently rebasing branch '%s' on '%s'."),
1355                                  s->state.branch,
1356                                  s->state.onto);
1357         else
1358                 status_printf_ln(s, color,
1359                                  _("You are currently rebasing."));
1360 }
1361
1362 static void show_rebase_in_progress(struct wt_status *s,
1363                                     const char *color)
1364 {
1365         struct stat st;
1366
1367         show_rebase_information(s, color);
1368         if (has_unmerged(s)) {
1369                 print_rebase_state(s, color);
1370                 if (s->hints) {
1371                         status_printf_ln(s, color,
1372                                 _("  (fix conflicts and then run \"git rebase --continue\")"));
1373                         status_printf_ln(s, color,
1374                                 _("  (use \"git rebase --skip\" to skip this patch)"));
1375                         status_printf_ln(s, color,
1376                                 _("  (use \"git rebase --abort\" to check out the original branch)"));
1377                 }
1378         } else if (s->state.rebase_in_progress ||
1379                    !stat(git_path_merge_msg(s->repo), &st)) {
1380                 print_rebase_state(s, color);
1381                 if (s->hints)
1382                         status_printf_ln(s, color,
1383                                 _("  (all conflicts fixed: run \"git rebase --continue\")"));
1384         } else if (split_commit_in_progress(s)) {
1385                 if (s->state.branch)
1386                         status_printf_ln(s, color,
1387                                          _("You are currently splitting a commit while rebasing branch '%s' on '%s'."),
1388                                          s->state.branch,
1389                                          s->state.onto);
1390                 else
1391                         status_printf_ln(s, color,
1392                                          _("You are currently splitting a commit during a rebase."));
1393                 if (s->hints)
1394                         status_printf_ln(s, color,
1395                                 _("  (Once your working directory is clean, run \"git rebase --continue\")"));
1396         } else {
1397                 if (s->state.branch)
1398                         status_printf_ln(s, color,
1399                                          _("You are currently editing a commit while rebasing branch '%s' on '%s'."),
1400                                          s->state.branch,
1401                                          s->state.onto);
1402                 else
1403                         status_printf_ln(s, color,
1404                                          _("You are currently editing a commit during a rebase."));
1405                 if (s->hints && !s->amend) {
1406                         status_printf_ln(s, color,
1407                                 _("  (use \"git commit --amend\" to amend the current commit)"));
1408                         status_printf_ln(s, color,
1409                                 _("  (use \"git rebase --continue\" once you are satisfied with your changes)"));
1410                 }
1411         }
1412         wt_longstatus_print_trailer(s);
1413 }
1414
1415 static void show_cherry_pick_in_progress(struct wt_status *s,
1416                                          const char *color)
1417 {
1418         if (is_null_oid(&s->state.cherry_pick_head_oid))
1419                 status_printf_ln(s, color,
1420                         _("Cherry-pick currently in progress."));
1421         else
1422                 status_printf_ln(s, color,
1423                         _("You are currently cherry-picking commit %s."),
1424                         find_unique_abbrev(&s->state.cherry_pick_head_oid,
1425                                            DEFAULT_ABBREV));
1426
1427         if (s->hints) {
1428                 if (has_unmerged(s))
1429                         status_printf_ln(s, color,
1430                                 _("  (fix conflicts and run \"git cherry-pick --continue\")"));
1431                 else if (is_null_oid(&s->state.cherry_pick_head_oid))
1432                         status_printf_ln(s, color,
1433                                 _("  (run \"git cherry-pick --continue\" to continue)"));
1434                 else
1435                         status_printf_ln(s, color,
1436                                 _("  (all conflicts fixed: run \"git cherry-pick --continue\")"));
1437                 status_printf_ln(s, color,
1438                         _("  (use \"git cherry-pick --skip\" to skip this patch)"));
1439                 status_printf_ln(s, color,
1440                         _("  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"));
1441         }
1442         wt_longstatus_print_trailer(s);
1443 }
1444
1445 static void show_revert_in_progress(struct wt_status *s,
1446                                     const char *color)
1447 {
1448         if (is_null_oid(&s->state.revert_head_oid))
1449                 status_printf_ln(s, color,
1450                         _("Revert currently in progress."));
1451         else
1452                 status_printf_ln(s, color,
1453                         _("You are currently reverting commit %s."),
1454                         find_unique_abbrev(&s->state.revert_head_oid,
1455                                            DEFAULT_ABBREV));
1456         if (s->hints) {
1457                 if (has_unmerged(s))
1458                         status_printf_ln(s, color,
1459                                 _("  (fix conflicts and run \"git revert --continue\")"));
1460                 else if (is_null_oid(&s->state.revert_head_oid))
1461                         status_printf_ln(s, color,
1462                                 _("  (run \"git revert --continue\" to continue)"));
1463                 else
1464                         status_printf_ln(s, color,
1465                                 _("  (all conflicts fixed: run \"git revert --continue\")"));
1466                 status_printf_ln(s, color,
1467                         _("  (use \"git revert --skip\" to skip this patch)"));
1468                 status_printf_ln(s, color,
1469                         _("  (use \"git revert --abort\" to cancel the revert operation)"));
1470         }
1471         wt_longstatus_print_trailer(s);
1472 }
1473
1474 static void show_bisect_in_progress(struct wt_status *s,
1475                                     const char *color)
1476 {
1477         if (s->state.branch)
1478                 status_printf_ln(s, color,
1479                                  _("You are currently bisecting, started from branch '%s'."),
1480                                  s->state.branch);
1481         else
1482                 status_printf_ln(s, color,
1483                                  _("You are currently bisecting."));
1484         if (s->hints)
1485                 status_printf_ln(s, color,
1486                         _("  (use \"git bisect reset\" to get back to the original branch)"));
1487         wt_longstatus_print_trailer(s);
1488 }
1489
1490 static void show_sparse_checkout_in_use(struct wt_status *s,
1491                                         const char *color)
1492 {
1493         if (s->state.sparse_checkout_percentage == SPARSE_CHECKOUT_DISABLED)
1494                 return;
1495
1496         status_printf_ln(s, color,
1497                          _("You are in a sparse checkout with %d%% of tracked files present."),
1498                          s->state.sparse_checkout_percentage);
1499         wt_longstatus_print_trailer(s);
1500 }
1501
1502 /*
1503  * Extract branch information from rebase/bisect
1504  */
1505 static char *get_branch(const struct worktree *wt, const char *path)
1506 {
1507         struct strbuf sb = STRBUF_INIT;
1508         struct object_id oid;
1509         const char *branch_name;
1510
1511         if (strbuf_read_file(&sb, worktree_git_path(wt, "%s", path), 0) <= 0)
1512                 goto got_nothing;
1513
1514         while (sb.len && sb.buf[sb.len - 1] == '\n')
1515                 strbuf_setlen(&sb, sb.len - 1);
1516         if (!sb.len)
1517                 goto got_nothing;
1518         if (skip_prefix(sb.buf, "refs/heads/", &branch_name))
1519                 strbuf_remove(&sb, 0, branch_name - sb.buf);
1520         else if (starts_with(sb.buf, "refs/"))
1521                 ;
1522         else if (!get_oid_hex(sb.buf, &oid)) {
1523                 strbuf_reset(&sb);
1524                 strbuf_add_unique_abbrev(&sb, &oid, DEFAULT_ABBREV);
1525         } else if (!strcmp(sb.buf, "detached HEAD")) /* rebase */
1526                 goto got_nothing;
1527         else                    /* bisect */
1528                 ;
1529         return strbuf_detach(&sb, NULL);
1530
1531 got_nothing:
1532         strbuf_release(&sb);
1533         return NULL;
1534 }
1535
1536 struct grab_1st_switch_cbdata {
1537         struct strbuf buf;
1538         struct object_id noid;
1539 };
1540
1541 static int grab_1st_switch(struct object_id *ooid, struct object_id *noid,
1542                            const char *email, timestamp_t timestamp, int tz,
1543                            const char *message, void *cb_data)
1544 {
1545         struct grab_1st_switch_cbdata *cb = cb_data;
1546         const char *target = NULL, *end;
1547
1548         if (!skip_prefix(message, "checkout: moving from ", &message))
1549                 return 0;
1550         target = strstr(message, " to ");
1551         if (!target)
1552                 return 0;
1553         target += strlen(" to ");
1554         strbuf_reset(&cb->buf);
1555         oidcpy(&cb->noid, noid);
1556         end = strchrnul(target, '\n');
1557         strbuf_add(&cb->buf, target, end - target);
1558         if (!strcmp(cb->buf.buf, "HEAD")) {
1559                 /* HEAD is relative. Resolve it to the right reflog entry. */
1560                 strbuf_reset(&cb->buf);
1561                 strbuf_add_unique_abbrev(&cb->buf, noid, DEFAULT_ABBREV);
1562         }
1563         return 1;
1564 }
1565
1566 static void wt_status_get_detached_from(struct repository *r,
1567                                         struct wt_status_state *state)
1568 {
1569         struct grab_1st_switch_cbdata cb;
1570         struct commit *commit;
1571         struct object_id oid;
1572         char *ref = NULL;
1573
1574         strbuf_init(&cb.buf, 0);
1575         if (for_each_reflog_ent_reverse("HEAD", grab_1st_switch, &cb) <= 0) {
1576                 strbuf_release(&cb.buf);
1577                 return;
1578         }
1579
1580         if (dwim_ref(cb.buf.buf, cb.buf.len, &oid, &ref, 1) == 1 &&
1581             /* oid is a commit? match without further lookup */
1582             (oideq(&cb.noid, &oid) ||
1583              /* perhaps oid is a tag, try to dereference to a commit */
1584              ((commit = lookup_commit_reference_gently(r, &oid, 1)) != NULL &&
1585               oideq(&cb.noid, &commit->object.oid)))) {
1586                 const char *from = ref;
1587                 if (!skip_prefix(from, "refs/tags/", &from))
1588                         skip_prefix(from, "refs/remotes/", &from);
1589                 state->detached_from = xstrdup(from);
1590         } else
1591                 state->detached_from =
1592                         xstrdup(find_unique_abbrev(&cb.noid, DEFAULT_ABBREV));
1593         oidcpy(&state->detached_oid, &cb.noid);
1594         state->detached_at = !get_oid("HEAD", &oid) &&
1595                              oideq(&oid, &state->detached_oid);
1596
1597         free(ref);
1598         strbuf_release(&cb.buf);
1599 }
1600
1601 int wt_status_check_rebase(const struct worktree *wt,
1602                            struct wt_status_state *state)
1603 {
1604         struct stat st;
1605
1606         if (!stat(worktree_git_path(wt, "rebase-apply"), &st)) {
1607                 if (!stat(worktree_git_path(wt, "rebase-apply/applying"), &st)) {
1608                         state->am_in_progress = 1;
1609                         if (!stat(worktree_git_path(wt, "rebase-apply/patch"), &st) && !st.st_size)
1610                                 state->am_empty_patch = 1;
1611                 } else {
1612                         state->rebase_in_progress = 1;
1613                         state->branch = get_branch(wt, "rebase-apply/head-name");
1614                         state->onto = get_branch(wt, "rebase-apply/onto");
1615                 }
1616         } else if (!stat(worktree_git_path(wt, "rebase-merge"), &st)) {
1617                 if (!stat(worktree_git_path(wt, "rebase-merge/interactive"), &st))
1618                         state->rebase_interactive_in_progress = 1;
1619                 else
1620                         state->rebase_in_progress = 1;
1621                 state->branch = get_branch(wt, "rebase-merge/head-name");
1622                 state->onto = get_branch(wt, "rebase-merge/onto");
1623         } else
1624                 return 0;
1625         return 1;
1626 }
1627
1628 int wt_status_check_bisect(const struct worktree *wt,
1629                            struct wt_status_state *state)
1630 {
1631         struct stat st;
1632
1633         if (!stat(worktree_git_path(wt, "BISECT_LOG"), &st)) {
1634                 state->bisect_in_progress = 1;
1635                 state->branch = get_branch(wt, "BISECT_START");
1636                 return 1;
1637         }
1638         return 0;
1639 }
1640
1641 static void wt_status_check_sparse_checkout(struct repository *r,
1642                                             struct wt_status_state *state)
1643 {
1644         int skip_worktree = 0;
1645         int i;
1646
1647         if (!core_apply_sparse_checkout || r->index->cache_nr == 0) {
1648                 /*
1649                  * Don't compute percentage of checked out files if we
1650                  * aren't in a sparse checkout or would get division by 0.
1651                  */
1652                 state->sparse_checkout_percentage = SPARSE_CHECKOUT_DISABLED;
1653                 return;
1654         }
1655
1656         for (i = 0; i < r->index->cache_nr; i++) {
1657                 struct cache_entry *ce = r->index->cache[i];
1658                 if (ce_skip_worktree(ce))
1659                         skip_worktree++;
1660         }
1661
1662         state->sparse_checkout_percentage =
1663                 100 - (100 * skip_worktree)/r->index->cache_nr;
1664 }
1665
1666 void wt_status_get_state(struct repository *r,
1667                          struct wt_status_state *state,
1668                          int get_detached_from)
1669 {
1670         struct stat st;
1671         struct object_id oid;
1672         enum replay_action action;
1673
1674         if (!stat(git_path_merge_head(r), &st)) {
1675                 wt_status_check_rebase(NULL, state);
1676                 state->merge_in_progress = 1;
1677         } else if (wt_status_check_rebase(NULL, state)) {
1678                 ;               /* all set */
1679         } else if (refs_ref_exists(get_main_ref_store(r), "CHERRY_PICK_HEAD") &&
1680                    !get_oid("CHERRY_PICK_HEAD", &oid)) {
1681                 state->cherry_pick_in_progress = 1;
1682                 oidcpy(&state->cherry_pick_head_oid, &oid);
1683         }
1684         wt_status_check_bisect(NULL, state);
1685         if (refs_ref_exists(get_main_ref_store(r), "REVERT_HEAD") &&
1686             !get_oid("REVERT_HEAD", &oid)) {
1687                 state->revert_in_progress = 1;
1688                 oidcpy(&state->revert_head_oid, &oid);
1689         }
1690         if (!sequencer_get_last_command(r, &action)) {
1691                 if (action == REPLAY_PICK) {
1692                         state->cherry_pick_in_progress = 1;
1693                         oidcpy(&state->cherry_pick_head_oid, null_oid());
1694                 } else {
1695                         state->revert_in_progress = 1;
1696                         oidcpy(&state->revert_head_oid, null_oid());
1697                 }
1698         }
1699         if (get_detached_from)
1700                 wt_status_get_detached_from(r, state);
1701         wt_status_check_sparse_checkout(r, state);
1702 }
1703
1704 static void wt_longstatus_print_state(struct wt_status *s)
1705 {
1706         const char *state_color = color(WT_STATUS_HEADER, s);
1707         struct wt_status_state *state = &s->state;
1708
1709         if (state->merge_in_progress) {
1710                 if (state->rebase_interactive_in_progress) {
1711                         show_rebase_information(s, state_color);
1712                         fputs("\n", s->fp);
1713                 }
1714                 show_merge_in_progress(s, state_color);
1715         } else if (state->am_in_progress)
1716                 show_am_in_progress(s, state_color);
1717         else if (state->rebase_in_progress || state->rebase_interactive_in_progress)
1718                 show_rebase_in_progress(s, state_color);
1719         else if (state->cherry_pick_in_progress)
1720                 show_cherry_pick_in_progress(s, state_color);
1721         else if (state->revert_in_progress)
1722                 show_revert_in_progress(s, state_color);
1723         if (state->bisect_in_progress)
1724                 show_bisect_in_progress(s, state_color);
1725
1726         if (state->sparse_checkout_percentage != SPARSE_CHECKOUT_DISABLED)
1727                 show_sparse_checkout_in_use(s, state_color);
1728 }
1729
1730 static void wt_longstatus_print(struct wt_status *s)
1731 {
1732         const char *branch_color = color(WT_STATUS_ONBRANCH, s);
1733         const char *branch_status_color = color(WT_STATUS_HEADER, s);
1734
1735         if (s->branch) {
1736                 const char *on_what = _("On branch ");
1737                 const char *branch_name = s->branch;
1738                 if (!strcmp(branch_name, "HEAD")) {
1739                         branch_status_color = color(WT_STATUS_NOBRANCH, s);
1740                         if (s->state.rebase_in_progress ||
1741                             s->state.rebase_interactive_in_progress) {
1742                                 if (s->state.rebase_interactive_in_progress)
1743                                         on_what = _("interactive rebase in progress; onto ");
1744                                 else
1745                                         on_what = _("rebase in progress; onto ");
1746                                 branch_name = s->state.onto;
1747                         } else if (s->state.detached_from) {
1748                                 branch_name = s->state.detached_from;
1749                                 if (s->state.detached_at)
1750                                         on_what = _("HEAD detached at ");
1751                                 else
1752                                         on_what = _("HEAD detached from ");
1753                         } else {
1754                                 branch_name = "";
1755                                 on_what = _("Not currently on any branch.");
1756                         }
1757                 } else
1758                         skip_prefix(branch_name, "refs/heads/", &branch_name);
1759                 status_printf(s, color(WT_STATUS_HEADER, s), "%s", "");
1760                 status_printf_more(s, branch_status_color, "%s", on_what);
1761                 status_printf_more(s, branch_color, "%s\n", branch_name);
1762                 if (!s->is_initial)
1763                         wt_longstatus_print_tracking(s);
1764         }
1765
1766         wt_longstatus_print_state(s);
1767
1768         if (s->is_initial) {
1769                 status_printf_ln(s, color(WT_STATUS_HEADER, s), "%s", "");
1770                 status_printf_ln(s, color(WT_STATUS_HEADER, s),
1771                                  s->commit_template
1772                                  ? _("Initial commit")
1773                                  : _("No commits yet"));
1774                 status_printf_ln(s, color(WT_STATUS_HEADER, s), "%s", "");
1775         }
1776
1777         wt_longstatus_print_updated(s);
1778         wt_longstatus_print_unmerged(s);
1779         wt_longstatus_print_changed(s);
1780         if (s->submodule_summary &&
1781             (!s->ignore_submodule_arg ||
1782              strcmp(s->ignore_submodule_arg, "all"))) {
1783                 wt_longstatus_print_submodule_summary(s, 0);  /* staged */
1784                 wt_longstatus_print_submodule_summary(s, 1);  /* unstaged */
1785         }
1786         if (s->show_untracked_files) {
1787                 wt_longstatus_print_other(s, &s->untracked, _("Untracked files"), "add");
1788                 if (s->show_ignored_mode)
1789                         wt_longstatus_print_other(s, &s->ignored, _("Ignored files"), "add -f");
1790                 if (advice_status_u_option && 2000 < s->untracked_in_ms) {
1791                         status_printf_ln(s, GIT_COLOR_NORMAL, "%s", "");
1792                         status_printf_ln(s, GIT_COLOR_NORMAL,
1793                                          _("It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
1794                                            "may speed it up, but you have to be careful not to forget to add\n"
1795                                            "new files yourself (see 'git help status')."),
1796                                          s->untracked_in_ms / 1000.0);
1797                 }
1798         } else if (s->committable)
1799                 status_printf_ln(s, GIT_COLOR_NORMAL, _("Untracked files not listed%s"),
1800                         s->hints
1801                         ? _(" (use -u option to show untracked files)") : "");
1802
1803         if (s->verbose)
1804                 wt_longstatus_print_verbose(s);
1805         if (!s->committable) {
1806                 if (s->amend)
1807                         status_printf_ln(s, GIT_COLOR_NORMAL, _("No changes"));
1808                 else if (s->nowarn)
1809                         ; /* nothing */
1810                 else if (s->workdir_dirty) {
1811                         if (s->hints)
1812                                 fprintf(s->fp, _("no changes added to commit "
1813                                                  "(use \"git add\" and/or "
1814                                                  "\"git commit -a\")\n"));
1815                         else
1816                                 fprintf(s->fp, _("no changes added to "
1817                                                  "commit\n"));
1818                 } else if (s->untracked.nr) {
1819                         if (s->hints)
1820                                 fprintf(s->fp, _("nothing added to commit but "
1821                                                  "untracked files present (use "
1822                                                  "\"git add\" to track)\n"));
1823                         else
1824                                 fprintf(s->fp, _("nothing added to commit but "
1825                                                  "untracked files present\n"));
1826                 } else if (s->is_initial) {
1827                         if (s->hints)
1828                                 fprintf(s->fp, _("nothing to commit (create/"
1829                                                  "copy files and use \"git "
1830                                                  "add\" to track)\n"));
1831                         else
1832                                 fprintf(s->fp, _("nothing to commit\n"));
1833                 } else if (!s->show_untracked_files) {
1834                         if (s->hints)
1835                                 fprintf(s->fp, _("nothing to commit (use -u to "
1836                                                  "show untracked files)\n"));
1837                         else
1838                                 fprintf(s->fp, _("nothing to commit\n"));
1839                 } else
1840                         fprintf(s->fp, _("nothing to commit, working tree "
1841                                          "clean\n"));
1842         }
1843         if(s->show_stash)
1844                 wt_longstatus_print_stash_summary(s);
1845 }
1846
1847 static void wt_shortstatus_unmerged(struct string_list_item *it,
1848                            struct wt_status *s)
1849 {
1850         struct wt_status_change_data *d = it->util;
1851         const char *how = "??";
1852
1853         switch (d->stagemask) {
1854         case 1: how = "DD"; break; /* both deleted */
1855         case 2: how = "AU"; break; /* added by us */
1856         case 3: how = "UD"; break; /* deleted by them */
1857         case 4: how = "UA"; break; /* added by them */
1858         case 5: how = "DU"; break; /* deleted by us */
1859         case 6: how = "AA"; break; /* both added */
1860         case 7: how = "UU"; break; /* both modified */
1861         }
1862         color_fprintf(s->fp, color(WT_STATUS_UNMERGED, s), "%s", how);
1863         if (s->null_termination) {
1864                 fprintf(s->fp, " %s%c", it->string, 0);
1865         } else {
1866                 struct strbuf onebuf = STRBUF_INIT;
1867                 const char *one;
1868                 one = quote_path(it->string, s->prefix, &onebuf, QUOTE_PATH_QUOTE_SP);
1869                 fprintf(s->fp, " %s\n", one);
1870                 strbuf_release(&onebuf);
1871         }
1872 }
1873
1874 static void wt_shortstatus_status(struct string_list_item *it,
1875                          struct wt_status *s)
1876 {
1877         struct wt_status_change_data *d = it->util;
1878
1879         if (d->index_status)
1880                 color_fprintf(s->fp, color(WT_STATUS_UPDATED, s), "%c", d->index_status);
1881         else
1882                 fputc(' ', s->fp);
1883         if (d->worktree_status)
1884                 color_fprintf(s->fp, color(WT_STATUS_CHANGED, s), "%c", d->worktree_status);
1885         else
1886                 fputc(' ', s->fp);
1887         fputc(' ', s->fp);
1888         if (s->null_termination) {
1889                 fprintf(s->fp, "%s%c", it->string, 0);
1890                 if (d->rename_source)
1891                         fprintf(s->fp, "%s%c", d->rename_source, 0);
1892         } else {
1893                 struct strbuf onebuf = STRBUF_INIT;
1894                 const char *one;
1895
1896                 if (d->rename_source) {
1897                         one = quote_path(d->rename_source, s->prefix, &onebuf,
1898                                          QUOTE_PATH_QUOTE_SP);
1899                         fprintf(s->fp, "%s -> ", one);
1900                         strbuf_release(&onebuf);
1901                 }
1902                 one = quote_path(it->string, s->prefix, &onebuf, QUOTE_PATH_QUOTE_SP);
1903                 fprintf(s->fp, "%s\n", one);
1904                 strbuf_release(&onebuf);
1905         }
1906 }
1907
1908 static void wt_shortstatus_other(struct string_list_item *it,
1909                                  struct wt_status *s, const char *sign)
1910 {
1911         if (s->null_termination) {
1912                 fprintf(s->fp, "%s %s%c", sign, it->string, 0);
1913         } else {
1914                 struct strbuf onebuf = STRBUF_INIT;
1915                 const char *one;
1916                 one = quote_path(it->string, s->prefix, &onebuf, QUOTE_PATH_QUOTE_SP);
1917                 color_fprintf(s->fp, color(WT_STATUS_UNTRACKED, s), "%s", sign);
1918                 fprintf(s->fp, " %s\n", one);
1919                 strbuf_release(&onebuf);
1920         }
1921 }
1922
1923 static void wt_shortstatus_print_tracking(struct wt_status *s)
1924 {
1925         struct branch *branch;
1926         const char *header_color = color(WT_STATUS_HEADER, s);
1927         const char *branch_color_local = color(WT_STATUS_LOCAL_BRANCH, s);
1928         const char *branch_color_remote = color(WT_STATUS_REMOTE_BRANCH, s);
1929
1930         const char *base;
1931         char *short_base;
1932         const char *branch_name;
1933         int num_ours, num_theirs, sti;
1934         int upstream_is_gone = 0;
1935
1936         color_fprintf(s->fp, color(WT_STATUS_HEADER, s), "## ");
1937
1938         if (!s->branch)
1939                 return;
1940         branch_name = s->branch;
1941
1942 #define LABEL(string) (s->no_gettext ? (string) : _(string))
1943
1944         if (s->is_initial)
1945                 color_fprintf(s->fp, header_color, LABEL(N_("No commits yet on ")));
1946
1947         if (!strcmp(s->branch, "HEAD")) {
1948                 color_fprintf(s->fp, color(WT_STATUS_NOBRANCH, s), "%s",
1949                               LABEL(N_("HEAD (no branch)")));
1950                 goto conclude;
1951         }
1952
1953         skip_prefix(branch_name, "refs/heads/", &branch_name);
1954
1955         branch = branch_get(branch_name);
1956
1957         color_fprintf(s->fp, branch_color_local, "%s", branch_name);
1958
1959         sti = stat_tracking_info(branch, &num_ours, &num_theirs, &base,
1960                                  0, s->ahead_behind_flags);
1961         if (sti < 0) {
1962                 if (!base)
1963                         goto conclude;
1964
1965                 upstream_is_gone = 1;
1966         }
1967
1968         short_base = shorten_unambiguous_ref(base, 0);
1969         color_fprintf(s->fp, header_color, "...");
1970         color_fprintf(s->fp, branch_color_remote, "%s", short_base);
1971         free(short_base);
1972
1973         if (!upstream_is_gone && !sti)
1974                 goto conclude;
1975
1976         color_fprintf(s->fp, header_color, " [");
1977         if (upstream_is_gone) {
1978                 color_fprintf(s->fp, header_color, LABEL(N_("gone")));
1979         } else if (s->ahead_behind_flags == AHEAD_BEHIND_QUICK) {
1980                 color_fprintf(s->fp, header_color, LABEL(N_("different")));
1981         } else if (!num_ours) {
1982                 color_fprintf(s->fp, header_color, LABEL(N_("behind ")));
1983                 color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
1984         } else if (!num_theirs) {
1985                 color_fprintf(s->fp, header_color, LABEL(N_("ahead ")));
1986                 color_fprintf(s->fp, branch_color_local, "%d", num_ours);
1987         } else {
1988                 color_fprintf(s->fp, header_color, LABEL(N_("ahead ")));
1989                 color_fprintf(s->fp, branch_color_local, "%d", num_ours);
1990                 color_fprintf(s->fp, header_color, ", %s", LABEL(N_("behind ")));
1991                 color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
1992         }
1993
1994         color_fprintf(s->fp, header_color, "]");
1995  conclude:
1996         fputc(s->null_termination ? '\0' : '\n', s->fp);
1997 }
1998
1999 static void wt_shortstatus_print(struct wt_status *s)
2000 {
2001         struct string_list_item *it;
2002
2003         if (s->show_branch)
2004                 wt_shortstatus_print_tracking(s);
2005
2006         for_each_string_list_item(it, &s->change) {
2007                 struct wt_status_change_data *d = it->util;
2008
2009                 if (d->stagemask)
2010                         wt_shortstatus_unmerged(it, s);
2011                 else
2012                         wt_shortstatus_status(it, s);
2013         }
2014         for_each_string_list_item(it, &s->untracked)
2015                 wt_shortstatus_other(it, s, "??");
2016
2017         for_each_string_list_item(it, &s->ignored)
2018                 wt_shortstatus_other(it, s, "!!");
2019 }
2020
2021 static void wt_porcelain_print(struct wt_status *s)
2022 {
2023         s->use_color = 0;
2024         s->relative_paths = 0;
2025         s->prefix = NULL;
2026         s->no_gettext = 1;
2027         wt_shortstatus_print(s);
2028 }
2029
2030 /*
2031  * Print branch information for porcelain v2 output.  These lines
2032  * are printed when the '--branch' parameter is given.
2033  *
2034  *    # branch.oid <commit><eol>
2035  *    # branch.head <head><eol>
2036  *   [# branch.upstream <upstream><eol>
2037  *   [# branch.ab +<ahead> -<behind><eol>]]
2038  *
2039  *      <commit> ::= the current commit hash or the literal
2040  *                   "(initial)" to indicate an initialized repo
2041  *                   with no commits.
2042  *
2043  *        <head> ::= <branch_name> the current branch name or
2044  *                   "(detached)" literal when detached head or
2045  *                   "(unknown)" when something is wrong.
2046  *
2047  *    <upstream> ::= the upstream branch name, when set.
2048  *
2049  *       <ahead> ::= integer ahead value or '?'.
2050  *
2051  *      <behind> ::= integer behind value or '?'.
2052  *
2053  * The end-of-line is defined by the -z flag.
2054  *
2055  *                 <eol> ::= NUL when -z,
2056  *                           LF when NOT -z.
2057  *
2058  * When an upstream is set and present, the 'branch.ab' line will
2059  * be printed with the ahead/behind counts for the branch and the
2060  * upstream.  When AHEAD_BEHIND_QUICK is requested and the branches
2061  * are different, '?' will be substituted for the actual count.
2062  */
2063 static void wt_porcelain_v2_print_tracking(struct wt_status *s)
2064 {
2065         struct branch *branch;
2066         const char *base;
2067         const char *branch_name;
2068         int ab_info, nr_ahead, nr_behind;
2069         char eol = s->null_termination ? '\0' : '\n';
2070
2071         fprintf(s->fp, "# branch.oid %s%c",
2072                         (s->is_initial ? "(initial)" : oid_to_hex(&s->oid_commit)),
2073                         eol);
2074
2075         if (!s->branch)
2076                 fprintf(s->fp, "# branch.head %s%c", "(unknown)", eol);
2077         else {
2078                 if (!strcmp(s->branch, "HEAD")) {
2079                         fprintf(s->fp, "# branch.head %s%c", "(detached)", eol);
2080
2081                         if (s->state.rebase_in_progress ||
2082                             s->state.rebase_interactive_in_progress)
2083                                 branch_name = s->state.onto;
2084                         else if (s->state.detached_from)
2085                                 branch_name = s->state.detached_from;
2086                         else
2087                                 branch_name = "";
2088                 } else {
2089                         branch_name = NULL;
2090                         skip_prefix(s->branch, "refs/heads/", &branch_name);
2091
2092                         fprintf(s->fp, "# branch.head %s%c", branch_name, eol);
2093                 }
2094
2095                 /* Lookup stats on the upstream tracking branch, if set. */
2096                 branch = branch_get(branch_name);
2097                 base = NULL;
2098                 ab_info = stat_tracking_info(branch, &nr_ahead, &nr_behind,
2099                                              &base, 0, s->ahead_behind_flags);
2100                 if (base) {
2101                         base = shorten_unambiguous_ref(base, 0);
2102                         fprintf(s->fp, "# branch.upstream %s%c", base, eol);
2103                         free((char *)base);
2104
2105                         if (ab_info > 0) {
2106                                 /* different */
2107                                 if (nr_ahead || nr_behind)
2108                                         fprintf(s->fp, "# branch.ab +%d -%d%c",
2109                                                 nr_ahead, nr_behind, eol);
2110                                 else
2111                                         fprintf(s->fp, "# branch.ab +? -?%c",
2112                                                 eol);
2113                         } else if (!ab_info) {
2114                                 /* same */
2115                                 fprintf(s->fp, "# branch.ab +0 -0%c", eol);
2116                         }
2117                 }
2118         }
2119 }
2120
2121 /*
2122  * Convert various submodule status values into a
2123  * fixed-length string of characters in the buffer provided.
2124  */
2125 static void wt_porcelain_v2_submodule_state(
2126         struct wt_status_change_data *d,
2127         char sub[5])
2128 {
2129         if (S_ISGITLINK(d->mode_head) ||
2130                 S_ISGITLINK(d->mode_index) ||
2131                 S_ISGITLINK(d->mode_worktree)) {
2132                 sub[0] = 'S';
2133                 sub[1] = d->new_submodule_commits ? 'C' : '.';
2134                 sub[2] = (d->dirty_submodule & DIRTY_SUBMODULE_MODIFIED) ? 'M' : '.';
2135                 sub[3] = (d->dirty_submodule & DIRTY_SUBMODULE_UNTRACKED) ? 'U' : '.';
2136         } else {
2137                 sub[0] = 'N';
2138                 sub[1] = '.';
2139                 sub[2] = '.';
2140                 sub[3] = '.';
2141         }
2142         sub[4] = 0;
2143 }
2144
2145 /*
2146  * Fix-up changed entries before we print them.
2147  */
2148 static void wt_porcelain_v2_fix_up_changed(struct string_list_item *it)
2149 {
2150         struct wt_status_change_data *d = it->util;
2151
2152         if (!d->index_status) {
2153                 /*
2154                  * This entry is unchanged in the index (relative to the head).
2155                  * Therefore, the collect_updated_cb was never called for this
2156                  * entry (during the head-vs-index scan) and so the head column
2157                  * fields were never set.
2158                  *
2159                  * We must have data for the index column (from the
2160                  * index-vs-worktree scan (otherwise, this entry should not be
2161                  * in the list of changes)).
2162                  *
2163                  * Copy index column fields to the head column, so that our
2164                  * output looks complete.
2165                  */
2166                 assert(d->mode_head == 0);
2167                 d->mode_head = d->mode_index;
2168                 oidcpy(&d->oid_head, &d->oid_index);
2169         }
2170
2171         if (!d->worktree_status) {
2172                 /*
2173                  * This entry is unchanged in the worktree (relative to the index).
2174                  * Therefore, the collect_changed_cb was never called for this entry
2175                  * (during the index-vs-worktree scan) and so the worktree column
2176                  * fields were never set.
2177                  *
2178                  * We must have data for the index column (from the head-vs-index
2179                  * scan).
2180                  *
2181                  * Copy the index column fields to the worktree column so that
2182                  * our output looks complete.
2183                  *
2184                  * Note that we only have a mode field in the worktree column
2185                  * because the scan code tries really hard to not have to compute it.
2186                  */
2187                 assert(d->mode_worktree == 0);
2188                 d->mode_worktree = d->mode_index;
2189         }
2190 }
2191
2192 /*
2193  * Print porcelain v2 info for tracked entries with changes.
2194  */
2195 static void wt_porcelain_v2_print_changed_entry(
2196         struct string_list_item *it,
2197         struct wt_status *s)
2198 {
2199         struct wt_status_change_data *d = it->util;
2200         struct strbuf buf = STRBUF_INIT;
2201         struct strbuf buf_from = STRBUF_INIT;
2202         const char *path = NULL;
2203         const char *path_from = NULL;
2204         char key[3];
2205         char submodule_token[5];
2206         char sep_char, eol_char;
2207
2208         wt_porcelain_v2_fix_up_changed(it);
2209         wt_porcelain_v2_submodule_state(d, submodule_token);
2210
2211         key[0] = d->index_status ? d->index_status : '.';
2212         key[1] = d->worktree_status ? d->worktree_status : '.';
2213         key[2] = 0;
2214
2215         if (s->null_termination) {
2216                 /*
2217                  * In -z mode, we DO NOT C-quote pathnames.  Current path is ALWAYS first.
2218                  * A single NUL character separates them.
2219                  */
2220                 sep_char = '\0';
2221                 eol_char = '\0';
2222                 path = it->string;
2223                 path_from = d->rename_source;
2224         } else {
2225                 /*
2226                  * Path(s) are C-quoted if necessary. Current path is ALWAYS first.
2227                  * The source path is only present when necessary.
2228                  * A single TAB separates them (because paths can contain spaces
2229                  * which are not escaped and C-quoting does escape TAB characters).
2230                  */
2231                 sep_char = '\t';
2232                 eol_char = '\n';
2233                 path = quote_path(it->string, s->prefix, &buf, 0);
2234                 if (d->rename_source)
2235                         path_from = quote_path(d->rename_source, s->prefix, &buf_from, 0);
2236         }
2237
2238         if (path_from)
2239                 fprintf(s->fp, "2 %s %s %06o %06o %06o %s %s %c%d %s%c%s%c",
2240                                 key, submodule_token,
2241                                 d->mode_head, d->mode_index, d->mode_worktree,
2242                                 oid_to_hex(&d->oid_head), oid_to_hex(&d->oid_index),
2243                                 d->rename_status, d->rename_score,
2244                                 path, sep_char, path_from, eol_char);
2245         else
2246                 fprintf(s->fp, "1 %s %s %06o %06o %06o %s %s %s%c",
2247                                 key, submodule_token,
2248                                 d->mode_head, d->mode_index, d->mode_worktree,
2249                                 oid_to_hex(&d->oid_head), oid_to_hex(&d->oid_index),
2250                                 path, eol_char);
2251
2252         strbuf_release(&buf);
2253         strbuf_release(&buf_from);
2254 }
2255
2256 /*
2257  * Print porcelain v2 status info for unmerged entries.
2258  */
2259 static void wt_porcelain_v2_print_unmerged_entry(
2260         struct string_list_item *it,
2261         struct wt_status *s)
2262 {
2263         struct wt_status_change_data *d = it->util;
2264         struct index_state *istate = s->repo->index;
2265         const struct cache_entry *ce;
2266         struct strbuf buf_index = STRBUF_INIT;
2267         const char *path_index = NULL;
2268         int pos, stage, sum;
2269         struct {
2270                 int mode;
2271                 struct object_id oid;
2272         } stages[3];
2273         char *key;
2274         char submodule_token[5];
2275         char unmerged_prefix = 'u';
2276         char eol_char = s->null_termination ? '\0' : '\n';
2277
2278         wt_porcelain_v2_submodule_state(d, submodule_token);
2279
2280         switch (d->stagemask) {
2281         case 1: key = "DD"; break; /* both deleted */
2282         case 2: key = "AU"; break; /* added by us */
2283         case 3: key = "UD"; break; /* deleted by them */
2284         case 4: key = "UA"; break; /* added by them */
2285         case 5: key = "DU"; break; /* deleted by us */
2286         case 6: key = "AA"; break; /* both added */
2287         case 7: key = "UU"; break; /* both modified */
2288         default:
2289                 BUG("unhandled unmerged status %x", d->stagemask);
2290         }
2291
2292         /*
2293          * Disregard d.aux.porcelain_v2 data that we accumulated
2294          * for the head and index columns during the scans and
2295          * replace with the actual stage data.
2296          *
2297          * Note that this is a last-one-wins for each the individual
2298          * stage [123] columns in the event of multiple cache entries
2299          * for same stage.
2300          */
2301         memset(stages, 0, sizeof(stages));
2302         sum = 0;
2303         pos = index_name_pos(istate, it->string, strlen(it->string));
2304         assert(pos < 0);
2305         pos = -pos-1;
2306         while (pos < istate->cache_nr) {
2307                 ce = istate->cache[pos++];
2308                 stage = ce_stage(ce);
2309                 if (strcmp(ce->name, it->string) || !stage)
2310                         break;
2311                 stages[stage - 1].mode = ce->ce_mode;
2312                 oidcpy(&stages[stage - 1].oid, &ce->oid);
2313                 sum |= (1 << (stage - 1));
2314         }
2315         if (sum != d->stagemask)
2316                 BUG("observed stagemask 0x%x != expected stagemask 0x%x", sum, d->stagemask);
2317
2318         if (s->null_termination)
2319                 path_index = it->string;
2320         else
2321                 path_index = quote_path(it->string, s->prefix, &buf_index, 0);
2322
2323         fprintf(s->fp, "%c %s %s %06o %06o %06o %06o %s %s %s %s%c",
2324                         unmerged_prefix, key, submodule_token,
2325                         stages[0].mode, /* stage 1 */
2326                         stages[1].mode, /* stage 2 */
2327                         stages[2].mode, /* stage 3 */
2328                         d->mode_worktree,
2329                         oid_to_hex(&stages[0].oid), /* stage 1 */
2330                         oid_to_hex(&stages[1].oid), /* stage 2 */
2331                         oid_to_hex(&stages[2].oid), /* stage 3 */
2332                         path_index,
2333                         eol_char);
2334
2335         strbuf_release(&buf_index);
2336 }
2337
2338 /*
2339  * Print porcelain V2 status info for untracked and ignored entries.
2340  */
2341 static void wt_porcelain_v2_print_other(
2342         struct string_list_item *it,
2343         struct wt_status *s,
2344         char prefix)
2345 {
2346         struct strbuf buf = STRBUF_INIT;
2347         const char *path;
2348         char eol_char;
2349
2350         if (s->null_termination) {
2351                 path = it->string;
2352                 eol_char = '\0';
2353         } else {
2354                 path = quote_path(it->string, s->prefix, &buf, 0);
2355                 eol_char = '\n';
2356         }
2357
2358         fprintf(s->fp, "%c %s%c", prefix, path, eol_char);
2359
2360         strbuf_release(&buf);
2361 }
2362
2363 /*
2364  * Print porcelain V2 status.
2365  *
2366  * [<v2_branch>]
2367  * [<v2_changed_items>]*
2368  * [<v2_unmerged_items>]*
2369  * [<v2_untracked_items>]*
2370  * [<v2_ignored_items>]*
2371  *
2372  */
2373 static void wt_porcelain_v2_print(struct wt_status *s)
2374 {
2375         struct wt_status_change_data *d;
2376         struct string_list_item *it;
2377         int i;
2378
2379         if (s->show_branch)
2380                 wt_porcelain_v2_print_tracking(s);
2381
2382         for (i = 0; i < s->change.nr; i++) {
2383                 it = &(s->change.items[i]);
2384                 d = it->util;
2385                 if (!d->stagemask)
2386                         wt_porcelain_v2_print_changed_entry(it, s);
2387         }
2388
2389         for (i = 0; i < s->change.nr; i++) {
2390                 it = &(s->change.items[i]);
2391                 d = it->util;
2392                 if (d->stagemask)
2393                         wt_porcelain_v2_print_unmerged_entry(it, s);
2394         }
2395
2396         for (i = 0; i < s->untracked.nr; i++) {
2397                 it = &(s->untracked.items[i]);
2398                 wt_porcelain_v2_print_other(it, s, '?');
2399         }
2400
2401         for (i = 0; i < s->ignored.nr; i++) {
2402                 it = &(s->ignored.items[i]);
2403                 wt_porcelain_v2_print_other(it, s, '!');
2404         }
2405 }
2406
2407 void wt_status_print(struct wt_status *s)
2408 {
2409         trace2_data_intmax("status", s->repo, "count/changed", s->change.nr);
2410         trace2_data_intmax("status", s->repo, "count/untracked",
2411                            s->untracked.nr);
2412         trace2_data_intmax("status", s->repo, "count/ignored", s->ignored.nr);
2413
2414         trace2_region_enter("status", "print", s->repo);
2415
2416         switch (s->status_format) {
2417         case STATUS_FORMAT_SHORT:
2418                 wt_shortstatus_print(s);
2419                 break;
2420         case STATUS_FORMAT_PORCELAIN:
2421                 wt_porcelain_print(s);
2422                 break;
2423         case STATUS_FORMAT_PORCELAIN_V2:
2424                 wt_porcelain_v2_print(s);
2425                 break;
2426         case STATUS_FORMAT_UNSPECIFIED:
2427                 BUG("finalize_deferred_config() should have been called");
2428                 break;
2429         case STATUS_FORMAT_NONE:
2430         case STATUS_FORMAT_LONG:
2431                 wt_longstatus_print(s);
2432                 break;
2433         }
2434
2435         trace2_region_leave("status", "print", s->repo);
2436 }
2437
2438 /**
2439  * Returns 1 if there are unstaged changes, 0 otherwise.
2440  */
2441 int has_unstaged_changes(struct repository *r, int ignore_submodules)
2442 {
2443         struct rev_info rev_info;
2444         int result;
2445
2446         repo_init_revisions(r, &rev_info, NULL);
2447         if (ignore_submodules) {
2448                 rev_info.diffopt.flags.ignore_submodules = 1;
2449                 rev_info.diffopt.flags.override_submodule_config = 1;
2450         }
2451         rev_info.diffopt.flags.quick = 1;
2452         diff_setup_done(&rev_info.diffopt);
2453         result = run_diff_files(&rev_info, 0);
2454         return diff_result_code(&rev_info.diffopt, result);
2455 }
2456
2457 /**
2458  * Returns 1 if there are uncommitted changes, 0 otherwise.
2459  */
2460 int has_uncommitted_changes(struct repository *r,
2461                             int ignore_submodules)
2462 {
2463         struct rev_info rev_info;
2464         int result;
2465
2466         if (is_index_unborn(r->index))
2467                 return 0;
2468
2469         repo_init_revisions(r, &rev_info, NULL);
2470         if (ignore_submodules)
2471                 rev_info.diffopt.flags.ignore_submodules = 1;
2472         rev_info.diffopt.flags.quick = 1;
2473
2474         add_head_to_pending(&rev_info);
2475         if (!rev_info.pending.nr) {
2476                 /*
2477                  * We have no head (or it's corrupt); use the empty tree,
2478                  * which will complain if the index is non-empty.
2479                  */
2480                 struct tree *tree = lookup_tree(r, the_hash_algo->empty_tree);
2481                 add_pending_object(&rev_info, &tree->object, "");
2482         }
2483
2484         diff_setup_done(&rev_info.diffopt);
2485         result = run_diff_index(&rev_info, 1);
2486         object_array_clear(&rev_info.pending);
2487         return diff_result_code(&rev_info.diffopt, result);
2488 }
2489
2490 /**
2491  * If the work tree has unstaged or uncommitted changes, dies with the
2492  * appropriate message.
2493  */
2494 int require_clean_work_tree(struct repository *r,
2495                             const char *action,
2496                             const char *hint,
2497                             int ignore_submodules,
2498                             int gently)
2499 {
2500         struct lock_file lock_file = LOCK_INIT;
2501         int err = 0, fd;
2502
2503         fd = repo_hold_locked_index(r, &lock_file, 0);
2504         refresh_index(r->index, REFRESH_QUIET, NULL, NULL, NULL);
2505         if (0 <= fd)
2506                 repo_update_index_if_able(r, &lock_file);
2507         rollback_lock_file(&lock_file);
2508
2509         if (has_unstaged_changes(r, ignore_submodules)) {
2510                 /* TRANSLATORS: the action is e.g. "pull with rebase" */
2511                 error(_("cannot %s: You have unstaged changes."), _(action));
2512                 err = 1;
2513         }
2514
2515         if (has_uncommitted_changes(r, ignore_submodules)) {
2516                 if (err)
2517                         error(_("additionally, your index contains uncommitted changes."));
2518                 else
2519                         error(_("cannot %s: Your index contains uncommitted changes."),
2520                               _(action));
2521                 err = 1;
2522         }
2523
2524         if (err) {
2525                 if (hint)
2526                         error("%s", hint);
2527                 if (!gently)
2528                         exit(128);
2529         }
2530
2531         return err;
2532 }