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