summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--show-diff.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/show-diff.c b/show-diff.c
index 1f903af..0af2f10 100644
--- a/show-diff.c
+++ b/show-diff.c
@@ -167,6 +167,19 @@ int main(int argc, char **argv)
! matches_pathspec(ce, argv+1, argc-1))
continue;
+ if (ce_stage(ce)) {
+ if (machine_readable)
+ printf("U %s%c", ce->name, 0);
+ else
+ printf("%s: Unmerged\n",
+ ce->name);
+ while (i < entries &&
+ !strcmp(ce->name, active_cache[i]->name))
+ i++;
+ i--; /* compensate for loop control increments */
+ continue;
+ }
+
if (stat(ce->name, &st) < 0) {
if (errno == ENOENT && silent_on_nonexisting_files)
continue;