development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-07-04 16:48:40 +00:00
Code Issues Projects Releases Wiki Activity

Provide better feedback for the untracked only case in status output

Browse Source 
Since 98bf8a47c2 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>
This commit is contained in:
Jürgen Rühle 2007-01-10 23:25:03 +01:00 committed by Junio C Hamano
parent ccd14e569d
commit 2a3a3c247e
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
wt-status.c
View File

@ -47,10 +47,11 @@ void wt_status_prepare(struct wt_status *s)
s->reference = "HEAD"; s->reference = "HEAD";
s->amend = 0; s->amend = 0;
s->verbose = 0; s->verbose = 0;
s->commitable = 0;
s->untracked = 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) static void wt_status_print_cached_header(const char *reference)
@ -176,7 +177,7 @@ static void wt_status_print_changed_cb(struct diff_queue_struct *q,
struct wt_status *s = data; struct wt_status *s = data;
int i; int i;
if (q->nr) { if (q->nr) {
s->workdir_clean = 0; s->workdir_dirty = 1;
wt_status_print_header("Changed but not added", use_add_msg); wt_status_print_header("Changed but not added", use_add_msg);
} }
for (i = 0; i < q->nr; i++) for (i = 0; i < q->nr; i++)
@ -263,7 +264,7 @@ static void wt_status_print_untracked(struct wt_status *s)
continue; continue;
} }
if (!shown_header) { if (!shown_header) {
s->workdir_clean = 0; s->workdir_untracked = 1;
wt_status_print_header("Untracked files", use_add_msg); wt_status_print_header("Untracked files", use_add_msg);
shown_header = 1; shown_header = 1;
} }
@ -311,12 +312,14 @@ void wt_status_print(struct wt_status *s)
if (!s->commitable) { if (!s->commitable) {
if (s->amend) if (s->amend)
printf("# No changes\n"); printf("# No changes\n");
else if (s->workdir_clean) else if (s->workdir_dirty)
printf(s->is_initial
? "nothing to commit\n"
: "nothing to commit (working directory matches HEAD)\n");
else
printf("no changes added to commit (use \"git add\" and/or \"git commit [-a|-i|-o]\")\n"); 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");
} }
} }

6
wt-status.h
View File

@ -12,11 +12,13 @@ struct wt_status {
int is_initial; int is_initial;
char *branch; char *branch;
const char *reference; const char *reference;
int commitable;
int verbose; int verbose;
int amend; int amend;
int untracked; 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); int git_status_config(const char *var, const char *value);