}
static void wt_status_print_dirty_header(struct wt_status *s,
- int has_deleted)
+ int has_deleted,
+ int has_dirty_submodules)
{
const char *c = color(WT_STATUS_HEADER, s);
else
color_fprintf_ln(s->fp, c, "# (use \"git add/rm <file>...\" to update what will be committed)");
color_fprintf_ln(s->fp, c, "# (use \"git checkout -- <file>...\" to discard changes in working directory)");
+ if (has_dirty_submodules)
+ color_fprintf_ln(s->fp, c, "# (commit or discard the untracked or modified content in submodules)");
color_fprintf_ln(s->fp, c, "#");
}
char *two_name;
const char *one, *two;
struct strbuf onebuf = STRBUF_INIT, twobuf = STRBUF_INIT;
+ struct strbuf extra = STRBUF_INIT;
one_name = two_name = it->string;
switch (change_type) {
one_name = d->head_path;
break;
case WT_STATUS_CHANGED:
+ if (d->new_submodule_commits || d->dirty_submodule) {
+ strbuf_addstr(&extra, " (");
+ if (d->new_submodule_commits)
+ strbuf_addf(&extra, "new commits, ");
+ if (d->dirty_submodule & DIRTY_SUBMODULE_MODIFIED)
+ strbuf_addf(&extra, "modified content, ");
+ if (d->dirty_submodule & DIRTY_SUBMODULE_UNTRACKED)
+ strbuf_addf(&extra, "untracked content, ");
+ strbuf_setlen(&extra, extra.len - 2);
+ strbuf_addch(&extra, ')');
+ }
status = d->worktree_status;
break;
}
default:
die("bug: unhandled diff status %c", status);
}
+ if (extra.len) {
+ color_fprintf(s->fp, color(WT_STATUS_HEADER, s), "%s", extra.buf);
+ strbuf_release(&extra);
+ }
fprintf(s->fp, "\n");
strbuf_release(&onebuf);
strbuf_release(&twobuf);
}
if (!d->worktree_status)
d->worktree_status = p->status;
+ d->dirty_submodule = p->two->dirty_submodule;
+ if (S_ISGITLINK(p->two->mode))
+ d->new_submodule_commits = !!hashcmp(p->one->sha1, p->two->sha1);
}
}
init_revisions(&rev, NULL);
setup_revisions(0, NULL, &rev, NULL);
rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
+ DIFF_OPT_SET(&rev.diffopt, DIRTY_SUBMODULES);
+ if (!s->show_untracked_files)
+ DIFF_OPT_SET(&rev.diffopt, IGNORE_UNTRACKED_IN_SUBMODULES);
rev.diffopt.format_callback = wt_status_collect_changed_cb;
rev.diffopt.format_callback_data = s;
rev.prune_data = s->pathspec;
static void wt_status_collect_changes_index(struct wt_status *s)
{
struct rev_info rev;
+ struct setup_revision_opt opt;
init_revisions(&rev, NULL);
- setup_revisions(0, NULL, &rev,
- s->is_initial ? EMPTY_TREE_SHA1_HEX : s->reference);
+ memset(&opt, 0, sizeof(opt));
+ opt.def = s->is_initial ? EMPTY_TREE_SHA1_HEX : s->reference;
+ setup_revisions(0, NULL, &rev, &opt);
+
rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
rev.diffopt.format_callback = wt_status_collect_updated_cb;
rev.diffopt.format_callback_data = s;
* 0 : no change
* 1 : some change but no delete
*/
-static int wt_status_check_worktree_changes(struct wt_status *s)
+static int wt_status_check_worktree_changes(struct wt_status *s,
+ int *dirty_submodules)
{
int i;
int changes = 0;
+ *dirty_submodules = 0;
+
for (i = 0; i < s->change.nr; i++) {
struct wt_status_change_data *d;
d = s->change.items[i].util;
if (!d->worktree_status ||
d->worktree_status == DIFF_STATUS_UNMERGED)
continue;
- changes = 1;
+ if (!changes)
+ changes = 1;
+ if (d->dirty_submodule)
+ *dirty_submodules = 1;
if (d->worktree_status == DIFF_STATUS_DELETED)
- return -1;
+ changes = -1;
}
return changes;
}
static void wt_status_print_changed(struct wt_status *s)
{
- int i;
- int worktree_changes = wt_status_check_worktree_changes(s);
+ int i, dirty_submodules;
+ int worktree_changes = wt_status_check_worktree_changes(s, &dirty_submodules);
if (!worktree_changes)
return;
- wt_status_print_dirty_header(s, worktree_changes < 0);
+ wt_status_print_dirty_header(s, worktree_changes < 0, dirty_submodules);
for (i = 0; i < s->change.nr; i++) {
struct wt_status_change_data *d;
wt_status_print_trailer(s);
}
-static void wt_status_print_submodule_summary(struct wt_status *s)
+static void wt_status_print_submodule_summary(struct wt_status *s, int uncommitted)
{
struct child_process sm_summary;
char summary_limit[64];
const char *argv[] = {
"submodule",
"summary",
- "--cached",
+ uncommitted ? "--files" : "--cached",
"--for-status",
"--summary-limit",
summary_limit,
- s->amend ? "HEAD^" : "HEAD",
+ uncommitted ? NULL : (s->amend ? "HEAD^" : "HEAD"),
NULL
};
static void wt_status_print_verbose(struct wt_status *s)
{
struct rev_info rev;
+ struct setup_revision_opt opt;
init_revisions(&rev, NULL);
DIFF_OPT_SET(&rev.diffopt, ALLOW_TEXTCONV);
- setup_revisions(0, NULL, &rev,
- s->is_initial ? EMPTY_TREE_SHA1_HEX : s->reference);
+
+ memset(&opt, 0, sizeof(opt));
+ opt.def = s->is_initial ? EMPTY_TREE_SHA1_HEX : s->reference;
+ setup_revisions(0, NULL, &rev, &opt);
+
rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
rev.diffopt.detect_rename = 1;
rev.diffopt.file = s->fp;
wt_status_print_updated(s);
wt_status_print_unmerged(s);
wt_status_print_changed(s);
- if (s->submodule_summary)
- wt_status_print_submodule_summary(s);
+ if (s->submodule_summary) {
+ wt_status_print_submodule_summary(s, 0); /* staged */
+ wt_status_print_submodule_summary(s, 1); /* unstaged */
+ }
if (s->show_untracked_files)
wt_status_print_untracked(s);
else if (s->commitable)