diff options
| author | Petr Baudis <pasky@ucw.cz> | 2005-04-13 09:28:48 (GMT) |
|---|---|---|
| committer | Petr Baudis <xpasky@machine> | 2005-04-13 09:28:48 (GMT) |
| commit | 2de381f919829aec1e35d6c7cc33519295dcd053 (patch) | |
| tree | 3f703cd0cd32a4aa9892bda84c664c36e40f7921 /read-tree.c | |
| parent | bdd4da595a265a091a859754a22688f7351cddee (diff) | |
| download | git-2de381f919829aec1e35d6c7cc33519295dcd053.zip git-2de381f919829aec1e35d6c7cc33519295dcd053.tar.gz git-2de381f919829aec1e35d6c7cc33519295dcd053.tar.bz2 | |
[PATCH] Consolidate the error handling
Now there is error() for "library" errors and die() for fatal "application"
errors. usage() is now used strictly only for usage errors.
Signed-off-by: Petr Baudis <pasky@ucw.cz>
Diffstat (limited to 'read-tree.c')
| -rw-r--r-- | read-tree.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/read-tree.c b/read-tree.c index dc24e91..9aec97f 100644 --- a/read-tree.c +++ b/read-tree.c @@ -78,7 +78,7 @@ int main(int argc, char **argv) newfd = open(".git/index.lock", O_RDWR | O_CREAT | O_EXCL, 0600); if (newfd < 0) - usage("unable to create new cachefile"); + die("unable to create new cachefile"); atexit(remove_lock_file); remove_lock = 1; @@ -88,19 +88,19 @@ int main(int argc, char **argv) /* "-m" stands for "merge" current directory cache */ if (!strcmp(arg, "-m")) { if (active_cache) - usage("read-tree: cannot merge old cache on top of new"); + die("read-tree: cannot merge old cache on top of new"); if (read_cache() < 0) - usage("read-tree: corrupt directory cache"); + die("read-tree: corrupt directory cache"); continue; } if (get_sha1_hex(arg, sha1) < 0) usage("read-tree [-m] <sha1>"); if (read_tree(sha1, "", 0) < 0) - usage("failed to unpack tree object %s", arg); + die("failed to unpack tree object %s", arg); } if (write_cache(newfd, active_cache, active_nr) || rename(".git/index.lock", ".git/index")) - usage("unable to write new index file"); + die("unable to write new index file"); remove_lock = 0; return 0; } |