undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cat-file --batch / --batch-check: do not exit if hashes are missing

Browse Source 
Previously, cat-file --batch / --batch-check would silently exit if it
was passed a non-existent SHA1 on stdin.  Now it prints "<SHA1>
missing" as in all other cases (and as advertised in the
documentation).

Note that cat-file --batch-check (but not --batch) will still output
"error: unable to find <SHA1>" on stderr if a non-existent SHA1 is
passed, but this does not affect parsing its stdout.

Also, type <= 0 was previously using the potentially uninitialized
type variable (relying on it being 0); it is now being initialized.

Signed-off-by: Lea Wiemann <LeWiemann@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Lea Wiemann 2008-06-09 02:02:21 +02:00 committed by Junio C Hamano
parent 4e44ae45fe
commit 3c076dbe3c
2 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
builtin-cat-file.c
View File

@ -150,7 +150,7 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name)
static int batch_one_object(const char *obj_name, int print_contents) static int batch_one_object(const char *obj_name, int print_contents)
{ {
unsigned char sha1[20]; unsigned char sha1[20];
enum object_type type; enum object_type type = 0;
unsigned long size; unsigned long size;
void *contents = contents; void *contents = contents;
@ -168,8 +168,11 @@ static int batch_one_object(const char *obj_name, int print_contents)
else else
type = sha1_object_info(sha1, &size); type = sha1_object_info(sha1, &size);
if (type <= 0) if (type <= 0) {
return 1; printf("%s missing\n", obj_name);
fflush(stdout);
return 0;
}
printf("%s %s %lu\n", sha1_to_hex(sha1), typename(type), size); printf("%s %s %lu\n", sha1_to_hex(sha1), typename(type), size);
fflush(stdout); fflush(stdout);

24
t/t1006-cat-file.sh
View File

@ -174,9 +174,27 @@ do
' '
done done
test_expect_success "--batch-check for a non-existent object" ' test_expect_success "--batch-check for a non-existent named object" '
test "deadbeef missing" = \ test "foobar42 missing
"$(echo_without_newline deadbeef | git cat-file --batch-check)" foobar84 missing" = \
"$( ( echo foobar42; echo_without_newline foobar84; ) | git cat-file --batch-check)"
'
test_expect_success "--batch-check for a non-existent hash" '
test "0000000000000000000000000000000000000042 missing
0000000000000000000000000000000000000084 missing" = \
"$( ( echo 0000000000000000000000000000000000000042;
echo_without_newline 0000000000000000000000000000000000000084; ) \
| git cat-file --batch-check)"
'
test_expect_success "--batch for an existent and a non-existent hash" '
test "$tag_sha1 tag $tag_size
$tag_content
0000000000000000000000000000000000000000 missing" = \
"$( ( echo $tag_sha1;
echo_without_newline 0000000000000000000000000000000000000000; ) \
| git cat-file --batch)"
' '
test_expect_success "--batch-check for an emtpy line" ' test_expect_success "--batch-check for an emtpy line" '