Skip to content

Commit

Permalink
Clarify fetch error for missing objects.
Browse files Browse the repository at this point in the history
Otherwise there're such things like:

    Cannot obtain needed none 9a6e87b60dbd2305c95cecce7d9d60f849a0658d
    while processing commit 0000000000000000000000000000000000000000.

which while looks weird. What is the none needed for?

Signed-off-by: Junio C Hamano <junkio@cox.net>
  • Loading branch information
raalkml authored and Junio C Hamano committed Dec 13, 2006
1 parent 59f8674 commit 0d7a6e4
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions fetch.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,15 @@ void pull_say(const char *fmt, const char *hex)
fprintf(stderr, fmt, hex);
}

static void report_missing(const char *what, const unsigned char *missing)
static void report_missing(const struct object *obj)
{
char missing_hex[41];

strcpy(missing_hex, sha1_to_hex(missing));;
fprintf(stderr,
"Cannot obtain needed %s %s\nwhile processing commit %s.\n",
what, missing_hex, sha1_to_hex(current_commit_sha1));
strcpy(missing_hex, sha1_to_hex(obj->sha1));;
fprintf(stderr, "Cannot obtain needed %s %s\n",
obj->type ? typename(obj->type): "object", missing_hex);
if (!is_null_sha1(current_commit_sha1))
fprintf(stderr, "while processing commit %s.\n",
sha1_to_hex(current_commit_sha1));
}

static int process(struct object *obj);
Expand Down Expand Up @@ -177,7 +178,7 @@ static int loop(void)
*/
if (! (obj->flags & TO_SCAN)) {
if (fetch(obj->sha1)) {
report_missing(typename(obj->type), obj->sha1);
report_missing(obj);
return -1;
}
}
Expand Down

0 comments on commit 0d7a6e4

Please sign in to comment.