git-am: Don't accept an mbox on stdin of we already have a .dotest directory

diff --git a/unpack-file.c b/unpack-file.c
index 23a85623019c3b7a465fba86132df3f4b75d94a5..ccddf1d4b0cf7fd3a699d8b33cf5bc4c5c4435b7 100644 (file)
--- 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);