path: root/
diff options
authorLinus Torvalds <>2005-10-01 20:24:27 (GMT)
committerJunio C Hamano <>2005-10-02 06:55:47 (GMT)
commit5d1a5c02e8ac1c16688ea4a44512245f25a49f8a (patch)
tree432a047f1d08d8fa0bafce7fe9c1b2086dbb205f /
parent455a7f3275d264f6e66045b92c83747ec461dda5 (diff)
[PATCH] Better error reporting for "git status"
Instead of "git status" ignoring (and hiding) potential errors from the "git-update-index" call, make it exit if it fails, and show the error. In order to do this, use the "-q" flag (to ignore not-up-to-date files) and add a new "--unmerged" flag that allows unmerged entries in the index without any errors. This also avoids marking the index "changed" if an entry isn't actually modified, and makes sure that we exit with an understandable error message if the index is corrupt or unreadable. "read_cache()" no longer returns an error for the caller to check. Finally, make die() and usage() exit with recognizable error codes, if we ever want to check the failure reason in scripts. Signed-off-by: Linus Torvalds <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to '')
1 files changed, 1 insertions, 1 deletions
diff --git a/ b/
index ca9a154..44398d7 100755
--- a/
+++ b/
@@ -37,7 +37,7 @@ refs/heads/master) ;;
*) echo "# On branch $branch" ;;
-git-update-index --refresh >/dev/null 2>&1
+git-update-index -q --unmerged --refresh || exit
if GIT_DIR="$GIT_DIR" git-rev-parse --verify HEAD >/dev/null 2>&1