@matheusbsbs / matheus-bagliano / commits / 31fff305bc
Fork 0

Separate object name errors from usage errors

Separate object name errors from usage errors. Signed-off-by: Dmitry V. Levin <ldv@altlinux.org> Signed-off-by: Junio C Hamano <junkio@cox.net>

Dmitry V. Levin committed May 9, 2006 at 01:43 UTC 31fff305bcc6db3b8082eac7fc9e441b27964fea
13 files changed +36 -25
cat-file.c
+4 -3
@@ -103,8 +103,10 @@ int main(int argc, char **argv)
103
104 setup_git_directory();
105 git_config(git_default_config);
106 - if (argc != 3 || get_sha1(argv[2], sha1))
106 + if (argc != 3)
107 usage("git-cat-file [-t|-s|-e|-p|<type>] <sha1>");
108 + if (get_sha1(argv[2], sha1))
109 + die("Not a valid object name %s", argv[2]);
110
111 opt = 0;
112 if ( argv[1][0] == '-' ) {
@@ -133,8 +135,7 @@ int main(int argc, char **argv)
135 return !has_sha1_file(sha1);
136
137 case 'p':
136 - if (get_sha1(argv[2], sha1) ||
137 - sha1_object_info(sha1, type, NULL))
138 + if (sha1_object_info(sha1, type, NULL))
139 die("Not a valid object name %s", argv[2]);
140
141 /* custom pretty-print here */
commit-tree.c
+6 -2
@@ -91,15 +91,19 @@ int main(int argc, char **argv)
91
92 git_config(git_default_config);
93
94 - if (argc < 2 || get_sha1_hex(argv[1], tree_sha1) < 0)
94 + if (argc < 2)
95 usage(commit_tree_usage);
96 + if (get_sha1(argv[1], tree_sha1))
97 + die("Not a valid object name %s", argv[1]);
98
99 check_valid(tree_sha1, tree_type);
100 for (i = 2; i < argc; i += 2) {
101 char *a, *b;
102 a = argv[i]; b = argv[i+1];
101 - if (!b || strcmp(a, "-p") || get_sha1(b, parent_sha1[parents]))
103 + if (!b || strcmp(a, "-p"))
104 usage(commit_tree_usage);
105 + if (get_sha1(b, parent_sha1[parents]))
106 + die("Not a valid object name %s", b);
107 check_valid(parent_sha1[parents], commit_type);
108 if (new_parent(parents))
109 parents++;
convert-objects.c
+3 -1
@@ -321,8 +321,10 @@ int main(int argc, char **argv)
321
322 setup_git_directory();
323
324 - if (argc != 2 || get_sha1(argv[1], sha1))
324 + if (argc != 2)
325 usage("git-convert-objects <sha1>");
326 + if (get_sha1(argv[1], sha1))
327 + die("Not a valid object name %s", argv[1]);
328
329 entry = convert_entry(sha1);
330 printf("new sha1: %s\n", sha1_to_hex(entry->new_sha1));
describe.c
+3 -3
@@ -105,11 +105,11 @@ static void describe(char *arg, int last_one)
105 static int initialized = 0;
106 struct commit_name *n;
107
108 - if (get_sha1(arg, sha1) < 0)
109 - usage(describe_usage);
108 + if (get_sha1(arg, sha1))
109 + die("Not a valid object name %s", arg);
110 cmit = lookup_commit_reference(sha1);
111 if (!cmit)
112 - usage(describe_usage);
112 + die("%s is not a valid '%s' object", arg, commit_type);
113
114 if (!initialized) {
115 initialized = 1;
ls-tree.c
+2 -2
@@ -142,8 +142,8 @@ int main(int argc, const char **argv)
142
143 if (argc < 2)
144 usage(ls_tree_usage);
145 - if (get_sha1(argv[1], sha1) < 0)
146 - usage(ls_tree_usage);
145 + if (get_sha1(argv[1], sha1))
146 + die("Not a valid object name %s", argv[1]);
147
148 pathspec = get_pathspec(prefix, argv + 2);
149 tree = parse_tree_indirect(sha1);
merge-base.c
+5 -3
@@ -247,10 +247,12 @@ int main(int argc, char **argv)
247 usage(merge_base_usage);
248 argc--; argv++;
249 }
250 - if (argc != 3 ||
251 - get_sha1(argv[1], rev1key) ||
252 - get_sha1(argv[2], rev2key))
250 + if (argc != 3)
251 usage(merge_base_usage);
252 + if (get_sha1(argv[1], rev1key))
253 + die("Not a valid object name %s", argv[1]);
254 + if (get_sha1(argv[2], rev2key))
255 + die("Not a valid object name %s", argv[2]);
256 rev1 = lookup_commit_reference(rev1key);
257 rev2 = lookup_commit_reference(rev2key);
258 if (!rev1 || !rev2)
merge-tree.c
+1 -1
@@ -151,7 +151,7 @@ static void *get_tree_descriptor(struct tree_desc *desc, const char *rev)
151 unsigned char sha1[20];
152 void *buf;
153
154 - if (get_sha1(rev, sha1) < 0)
154 + if (get_sha1(rev, sha1))
155 die("unknown rev %s", rev);
156 buf = fill_tree_descriptor(desc, sha1);
157 if (!buf)
read-tree.c
+2 -2
@@ -794,8 +794,8 @@ int main(int argc, char **argv)
794 if (1 < index_only + update)
795 usage(read_tree_usage);
796
797 - if (get_sha1(arg, sha1) < 0)
798 - usage(read_tree_usage);
797 + if (get_sha1(arg, sha1))
798 + die("Not a valid object name %s", arg);
799 if (list_tree(sha1) < 0)
800 die("failed to unpack tree object %s", arg);
801 stage++;
revision.c
+2 -2
@@ -674,7 +674,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
674 local_flags = UNINTERESTING;
675 arg++;
676 }
677 - if (get_sha1(arg, sha1) < 0) {
677 + if (get_sha1(arg, sha1)) {
678 int j;
679
680 if (seen_dashdash || local_flags)
@@ -693,7 +693,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
693 if (def && !revs->commits) {
694 unsigned char sha1[20];
695 struct commit *commit;
696 - if (get_sha1(def, sha1) < 0)
696 + if (get_sha1(def, sha1))
697 die("bad default revision '%s'", def);
698 commit = get_commit_reference(revs, def, sha1, 0);
699 add_one_commit(commit, revs);
ssh-upload.c
+1 -1
@@ -134,7 +134,7 @@ int main(int argc, char **argv)
134 commit_id = argv[arg];
135 url = argv[arg + 1];
136 if (get_sha1(commit_id, sha1))
137 - usage(ssh_push_usage);
137 + die("Not a valid object name %s", commit_id);
138 memcpy(hex, sha1_to_hex(sha1), sizeof(hex));
139 argv[arg] = hex;
140
tar-tree.c
+2 -2
@@ -321,8 +321,8 @@ int main(int argc, char **argv)
321 strbuf_append_string(&current_path, "/");
322 /* FALLTHROUGH */
323 case 2:
324 - if (get_sha1(argv[1], sha1) < 0)
325 - usage(tar_tree_usage);
324 + if (get_sha1(argv[1], sha1))
325 + die("Not a valid object name %s", argv[1]);
326 break;
327 default:
328 usage(tar_tree_usage);
unpack-file.c
+3 -1
@@ -27,8 +27,10 @@ int main(int argc, char **argv)
27 {
28 unsigned char sha1[20];
29
30 - if (argc != 2 || get_sha1(argv[1], sha1))
30 + if (argc != 2)
31 usage("git-unpack-file <sha1>");
32 + if (get_sha1(argv[1], sha1))
33 + die("Not a valid object name %s", argv[1]);
34
35 setup_git_directory();
36 git_config(git_default_config);
update-ref.c
+2 -2
@@ -32,10 +32,10 @@ int main(int argc, char **argv)
32 refname = argv[1];
33 value = argv[2];
34 oldval = argv[3];
35 - if (get_sha1(value, sha1) < 0)
35 + if (get_sha1(value, sha1))
36 die("%s: not a valid SHA1", value);
37 memset(oldsha1, 0, 20);
38 - if (oldval && get_sha1(oldval, oldsha1) < 0)
38 + if (oldval && get_sha1(oldval, oldsha1))
39 die("%s: not a valid old SHA1", oldval);
40
41 path = resolve_ref(git_path("%s", refname), currsha1, !!oldval);