projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
include header to define uint32_t, necessary on Mac OS X
[git.git]
/
cat-file.c
diff --git
a/cat-file.c
b/cat-file.c
index
628f6ca
..
7413fee
100644
(file)
--- a/
cat-file.c
+++ b/
cat-file.c
@@
-103,8
+103,10
@@
int main(int argc, char **argv)
setup_git_directory();
git_config(git_default_config);
setup_git_directory();
git_config(git_default_config);
- if (argc != 3
|| get_sha1(argv[2], sha1)
)
+ if (argc != 3)
usage("git-cat-file [-t|-s|-e|-p|<type>] <sha1>");
usage("git-cat-file [-t|-s|-e|-p|<type>] <sha1>");
+ if (get_sha1(argv[2], sha1))
+ die("Not a valid object name %s", argv[2]);
opt = 0;
if ( argv[1][0] == '-' ) {
opt = 0;
if ( argv[1][0] == '-' ) {
@@
-133,8
+135,7
@@
int main(int argc, char **argv)
return !has_sha1_file(sha1);
case 'p':
return !has_sha1_file(sha1);
case 'p':
- if (get_sha1(argv[2], sha1) ||
- sha1_object_info(sha1, type, NULL))
+ if (sha1_object_info(sha1, type, NULL))
die("Not a valid object name %s", argv[2]);
/* custom pretty-print here */
die("Not a valid object name %s", argv[2]);
/* custom pretty-print here */