summaryrefslogtreecommitdiff
path: root/unpack-file.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-05-08 16:40:23 -0700
committerJunio C Hamano <junkio@cox.net>2006-05-08 16:40:23 -0700
commit45f75a0167b4a4693f2c6005bf7db231ca91ecc8 (patch)
treed7cb273a493d3b37aad4a41284cd8e2fb68f80c4 /unpack-file.c
parentfd60acaced6de16ebfb66959067e2b29f99a133e (diff)
parent31fff305bcc6db3b8082eac7fc9e441b27964fea (diff)
downloadgit-45f75a0167b4a4693f2c6005bf7db231ca91ecc8.tar.gz
Merge branch 'fix'
* fix: Separate object name errors from usage errors Documentation: {caret} fixes (git-rev-list.txt) Fix "git diff --stat" with long filenames Fix repo-config set-multivar error return path.
Diffstat (limited to 'unpack-file.c')
-rw-r--r--unpack-file.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/unpack-file.c b/unpack-file.c
index 23a8562301..ccddf1d4b0 100644
--- a/unpack-file.c
+++ b/unpack-file.c
@@ -27,8 +27,10 @@ int main(int argc, char **argv)
{
unsigned char sha1[20];
- if (argc != 2 || get_sha1(argv[1], sha1))
+ if (argc != 2)
usage("git-unpack-file <sha1>");
+ if (get_sha1(argv[1], sha1))
+ die("Not a valid object name %s", argv[1]);
setup_git_directory();
git_config(git_default_config);