1. Stefan Saasen
  2. git

Commits

Jürgen Rühle  committed 2a3a3c2

Provide better feedback for the untracked only case in status output

Since 98bf8a47c296f51ea9722fef4bb81dbfb70cd4bb status would claim that
git-commit could be useful even if there are no changes except untracked files.

Since wt-status is already computing all the information needed go the whole
way and actually track the (non-)emptiness of all three sections separately,
unify the code, and provide useful messages for each individual case.

Thanks to Junio and Michael Loeffler for suggestions.

Signed-off-by: Jürgen Rühle <j-r@online.de>

  • Participants
  • Parent commits ccd14e5
  • Branches master

Comments (0)

Files changed (2)

File wt-status.c

View file
  • Ignore whitespace
 	s->reference = "HEAD";
 	s->amend = 0;
 	s->verbose = 0;
-	s->commitable = 0;
 	s->untracked = 0;
 
-	s->workdir_clean = 1;
+	s->commitable = 0;
+	s->workdir_dirty = 0;
+	s->workdir_untracked = 0;
 }
 
 static void wt_status_print_cached_header(const char *reference)
 	struct wt_status *s = data;
 	int i;
 	if (q->nr) {
-		s->workdir_clean = 0;
+		s->workdir_dirty = 1;
 		wt_status_print_header("Changed but not added", use_add_msg);
 	}
 	for (i = 0; i < q->nr; i++)
 				continue;
 		}
 		if (!shown_header) {
-			s->workdir_clean = 0;
+			s->workdir_untracked = 1;
 			wt_status_print_header("Untracked files", use_add_msg);
 			shown_header = 1;
 		}
 	if (!s->commitable) {
 		if (s->amend)
 			printf("# No changes\n");
-		else if (s->workdir_clean)
-			printf(s->is_initial
-			       ? "nothing to commit\n"
-			       : "nothing to commit (working directory matches HEAD)\n");
-		else
+		else if (s->workdir_dirty)
 			printf("no changes added to commit (use \"git add\" and/or \"git commit [-a|-i|-o]\")\n");
+		else if (s->workdir_untracked)
+			printf("nothing added to commit but untracked files present (use \"git add\" to track)\n");
+		else if (s->is_initial)
+			printf("nothing to commit (create/copy files and use \"git add\" to track)\n");
+		else
+			printf("nothing to commit (working directory clean)\n");
 	}
 }
 

File wt-status.h

View file
  • Ignore whitespace
 	int is_initial;
 	char *branch;
 	const char *reference;
-	int commitable;
 	int verbose;
 	int amend;
 	int untracked;
-	int workdir_clean;
+	/* These are computed during processing of the individual sections */
+	int commitable;
+	int workdir_dirty;
+	int workdir_untracked;
 };
 
 int git_status_config(const char *var, const char *value);