You wouldn't believe how many of my merge commits end with
the following message from git-status:
"nothing to commit (working directory clean)"
This happens because of the way I sometimes create (and resolve)
some types of merges. My commit message buffer gets prepped with
the output of git-status, which has this nice message way down at the
bottom of the file, below a large-ish block of lines that start with
"#". Since git-commit strips those lines, I always fail to see the
trailing line that doesn't start with "#" and consequently fail to
see that "nothing to commit ..." will be part of my merge message.
So always comment out the output of git-status.
Signed-off-by: Shawn O. Pearce <spearce@xxxxxxxxxxx>
---
wt-status.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/wt-status.c b/wt-status.c
index a055990..a9ba1ae 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -336,13 +336,13 @@ void wt_status_print(struct wt_status *s)
if (s->amend)
printf("# No changes\n");
else if (s->workdir_dirty)
- printf("no changes added to commit (use \"git add\" and/or \"git commit -a\")\n");
+ printf("# no changes added to commit (use \"git add\" and/or \"git commit -a\")\n");
else if (s->workdir_untracked)
- printf("nothing added to commit but untracked files present (use \"git add\" to track)\n");
+ 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");
+ printf("# nothing to commit (create/copy files and use \"git add\" to track)\n");
else
- printf("nothing to commit (working directory clean)\n");
+ printf("# nothing to commit (working directory clean)\n");
}
}
--
1.5.2.rc2.716.gba45c
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html