diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-10-23 03:02:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-10-24 15:13:38 -0700 |
| commit | 7efc8e43508b415e2540dbcb79521bde16c51e0c (patch) | |
| tree | 6234aa4f7095054a137e030030f914dc6633f809 | |
| parent | 40a10462498bdd23d4e49f02867b8be50eb78704 (diff) | |
| download | git-7efc8e43508b415e2540dbcb79521bde16c51e0c.tar.gz git-7efc8e43508b415e2540dbcb79521bde16c51e0c.tar.xz | |
upload-pack: fix thinko in common-commit finder code.
The code to check if we have the object the other side has was bogus
(my fault).
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | upload-pack.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/upload-pack.c b/upload-pack.c index c3abf7ba6..25a343ecc 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -93,7 +93,9 @@ static int got_sha1(char *hex, unsigned char *sha1) return 0; if (nr_has < MAX_HAS) { struct object *o = lookup_object(sha1); - if (!o || (!o->parsed && !parse_object(sha1))) + if (!(o && o->parsed)) + o = parse_object(sha1); + if (!o) die("oops (%s)", sha1_to_hex(sha1)); if (o->type == commit_type) { struct commit_list *parents; |