Skip to main content

Browse the archive

Revision 5d1a5c02e8ac1c16688ea4a44512245f25a49f8a authored by Linus Torvalds on 01 October 2005, 20:24:27 UTC, committed by Junio C Hamano on 02 October 2005, 06:55:47 UTC 
[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 <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
1 parent 455a7f3
History
File Mode Size
Documentation
arm
compat
debian
mozilla-sha1
ppc
t
templates
.gitignore -rw-r--r-- 1.4 KB
COPYING -rw-r--r-- 18.3 KB
INSTALL -rw-r--r-- 2.8 KB
Makefile -rw-r--r-- 10.7 KB
README -rw-r--r-- 23.4 KB
apply.c -rw-r--r-- 34.6 KB
blob.c -rw-r--r-- 1.3 KB
blob.h -rw-r--r-- 311 bytes
cache.h -rw-r--r-- 11.6 KB
cat-file.c -rw-r--r-- 1.1 KB
checkout-index.c -rw-r--r-- 3.6 KB
clone-pack.c -rw-r--r-- 4.0 KB
cmd-rename.sh -rwxr-xr-x 1.5 KB
commit-tree.c -rw-r--r-- 3.1 KB
commit.c -rw-r--r-- 13.5 KB
commit.h -rw-r--r-- 1.9 KB
connect.c -rw-r--r-- 9.2 KB
convert-objects.c -rw-r--r-- 7.1 KB
count-delta.c -rw-r--r-- 2.2 KB
count-delta.h -rw-r--r-- 196 bytes
csum-file.c -rw-r--r-- 2.9 KB
csum-file.h -rw-r--r-- 566 bytes
daemon.c -rw-r--r-- 11.5 KB
date.c -rw-r--r-- 10.3 KB
delta.h -rw-r--r-- 919 bytes
diff-delta.c -rw-r--r-- 7.1 KB
diff-files.c -rw-r--r-- 2.7 KB
diff-index.c -rw-r--r-- 5.3 KB
diff-stages.c -rw-r--r-- 2.2 KB
diff-tree.c -rw-r--r-- 11.7 KB
diff.c -rw-r--r-- 30.7 KB
diff.h -rw-r--r-- 3.1 KB
diffcore-break.c -rw-r--r-- 8.4 KB
diffcore-order.c -rw-r--r-- 2.2 KB
diffcore-pathspec.c -rw-r--r-- 1.2 KB
diffcore-pickaxe.c -rw-r--r-- 2.5 KB
diffcore-rename.c -rw-r--r-- 12.6 KB
diffcore.h -rw-r--r-- 3.4 KB
entry.c -rw-r--r-- 3.6 KB
epoch.c -rw-r--r-- 16.9 KB
epoch.h -rw-r--r-- 476 bytes
fetch-pack.c -rw-r--r-- 3.7 KB
fetch.c -rw-r--r-- 4.7 KB
fetch.h -rw-r--r-- 1.4 KB
fsck-objects.c -rw-r--r-- 12.2 KB
get-tar-commit-id.c -rw-r--r-- 514 bytes
git-add.sh -rwxr-xr-x 524 bytes
git-applymbox.sh -rwxr-xr-x 2.6 KB
git-applypatch.sh -rwxr-xr-x 2.6 KB
git-archimport.perl -rwxr-xr-x 23.0 KB
git-bisect.sh -rwxr-xr-x 5.1 KB
git-branch.sh -rwxr-xr-x 2.1 KB
git-checkout.sh -rwxr-xr-x 1.7 KB
git-cherry.sh -rwxr-xr-x 1.8 KB
git-clone.sh -rwxr-xr-x 4.4 KB
git-commit.sh -rwxr-xr-x 5.2 KB
git-core.spec.in -rw-r--r-- 2.8 KB
git-count-objects.sh -rwxr-xr-x 346 bytes
git-cvsimport.perl -rwxr-xr-x 20.5 KB
git-diff.sh -rwxr-xr-x 940 bytes
git-external-diff-script -rwxr-xr-x 1.5 KB
git-fetch.sh -rwxr-xr-x 7.3 KB
git-fmt-merge-msg.perl -rwxr-xr-x 1.8 KB
git-format-patch.sh -rwxr-xr-x 5.1 KB
git-grep.sh -rwxr-xr-x 656 bytes
git-log.sh -rwxr-xr-x 351 bytes
git-ls-remote.sh -rwxr-xr-x 1.6 KB
git-merge-octopus.sh -rwxr-xr-x 1.7 KB
git-merge-one-file.sh -rwxr-xr-x 1.9 KB
git-merge-recursive.py -rwxr-xr-x 14.0 KB
git-merge-resolve.sh -rwxr-xr-x 864 bytes
git-merge-stupid.sh -rwxr-xr-x 1.4 KB
git-merge.sh -rwxr-xr-x 5.3 KB
git-octopus.sh -rwxr-xr-x 2.2 KB
git-parse-remote.sh -rwxr-xr-x 3.8 KB
git-prune.sh -rwxr-xr-x 500 bytes
git-pull.sh -rwxr-xr-x 1.9 KB
git-push.sh -rwxr-xr-x 967 bytes
git-rebase.sh -rwxr-xr-x 1.5 KB
git-relink.perl -rwxr-xr-x 4.0 KB
git-rename.perl -rwxr-xr-x 1.6 KB
git-repack.sh -rwxr-xr-x 1.5 KB
git-request-pull.sh -rwxr-xr-x 851 bytes
git-reset.sh -rwxr-xr-x 2.1 KB
git-resolve.sh -rwxr-xr-x 2.3 KB
git-revert.sh -rwxr-xr-x 3.8 KB
git-send-email.perl -rwxr-xr-x 8.4 KB
git-sh-setup.sh -rwxr-xr-x 592 bytes
git-shortlog.perl -rwxr-xr-x 3.8 KB
git-status.sh -rwxr-xr-x 1.5 KB
git-tag.sh -rwxr-xr-x 1.5 KB
git-verify-tag.sh -rwxr-xr-x 225 bytes
git-whatchanged.sh -rwxr-xr-x 264 bytes
git.sh -rwxr-xr-x 815 bytes
gitMergeCommon.py -rw-r--r-- 6.7 KB
gitk -rwxr-xr-x 96.1 KB
hash-object.c -rw-r--r-- 973 bytes
http-fetch.c -rw-r--r-- 17.2 KB
ident.c -rw-r--r-- 4.0 KB
index.c -rw-r--r-- 1.1 KB
init-db.c -rw-r--r-- 6.0 KB
local-fetch.c -rw-r--r-- 5.9 KB
ls-files.c -rw-r--r-- 14.6 KB
ls-tree.c -rw-r--r-- 5.6 KB
mailinfo.c -rw-r--r-- 14.9 KB
mailsplit.c -rw-r--r-- 2.5 KB
merge-base.c -rw-r--r-- 4.0 KB
merge-index.c -rw-r--r-- 2.6 KB
mktag.c -rw-r--r-- 3.2 KB
object.c -rw-r--r-- 4.8 KB
object.h -rw-r--r-- 1.4 KB
pack-check.c -rw-r--r-- 3.7 KB
pack-objects.c -rw-r--r-- 11.4 KB
pack.h -rw-r--r-- 618 bytes
patch-delta.c -rw-r--r-- 1.7 KB
patch-id.c -rw-r--r-- 1.4 KB
path.c -rw-r--r-- 1.7 KB
peek-remote.c -rw-r--r-- 970 bytes
pkt-line.c -rw-r--r-- 2.5 KB
pkt-line.h -rw-r--r-- 270 bytes
prune-packed.c -rw-r--r-- 1.4 KB
quote.c -rw-r--r-- 825 bytes
quote.h -rw-r--r-- 752 bytes
read-cache.c -rw-r--r-- 13.7 KB
read-tree.c -rw-r--r-- 14.9 KB
receive-pack.c -rw-r--r-- 6.3 KB
refs.c -rw-r--r-- 8.0 KB
refs.h -rw-r--r-- 1.0 KB
rev-list.c -rw-r--r-- 13.8 KB
rev-parse.c -rw-r--r-- 5.5 KB
rsh.c -rw-r--r-- 2.7 KB
rsh.h -rw-r--r-- 159 bytes
run-command.c -rw-r--r-- 1.2 KB
run-command.h -rw-r--r-- 360 bytes
send-pack.c -rw-r--r-- 7.0 KB
server-info.c -rw-r--r-- 11.5 KB
setup.c -rw-r--r-- 2.5 KB
sha1_file.c -rw-r--r-- 34.2 KB
sha1_name.c -rw-r--r-- 5.1 KB
show-branch.c -rw-r--r-- 11.8 KB
show-index.c -rw-r--r-- 593 bytes
ssh-fetch.c -rw-r--r-- 2.8 KB
ssh-pull.c -rw-r--r-- 154 bytes
ssh-push.c -rw-r--r-- 155 bytes
ssh-upload.c -rw-r--r-- 2.8 KB
strbuf.c -rw-r--r-- 807 bytes
strbuf.h -rw-r--r-- 216 bytes
stripspace.c -rw-r--r-- 786 bytes
symbolic-ref.c -rw-r--r-- 751 bytes
tag.c -rw-r--r-- 2.3 KB
tag.h -rw-r--r-- 452 bytes
tar-tree.c -rw-r--r-- 10.8 KB
test-date.c -rw-r--r-- 343 bytes
test-delta.c -rw-r--r-- 1.8 KB
tree.c -rw-r--r-- 5.5 KB
tree.h -rw-r--r-- 790 bytes
unpack-file.c -rw-r--r-- 684 bytes
unpack-objects.c -rw-r--r-- 6.7 KB
update-index.c -rw-r--r-- 9.4 KB
update-ref.c -rw-r--r-- 1.9 KB
update-server-info.c -rw-r--r-- 432 bytes
upload-pack.c -rw-r--r-- 3.9 KB
usage.c -rw-r--r-- 629 bytes
var.c -rw-r--r-- 1.1 KB
verify-pack.c -rw-r--r-- 1.1 KB
write-tree.c -rw-r--r-- 3.8 KB

README

back to top