diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2005-10-23 05:36:06 +0400 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-10-25 02:13:36 +0400 |
| commit | 794f9fe7db30e2aff8f8f0543c6d18bf579cdbc2 (patch) | |
| tree | 0fde599575753f49fccbeb61d79d3000f296503a /upload-pack.c | |
| parent | 35eb2d36418a25f9e956b116a622d8d99f4abad9 (diff) | |
git-upload-pack: More efficient usage of the has_sha1 array
This patch is based on Junio's proposal. It marks parents of common revs
so that they do not clutter up the has_sha1 array.
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'upload-pack.c')
| -rw-r--r-- | upload-pack.c | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/upload-pack.c b/upload-pack.c index accdba669b..ab1981c72a 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -3,9 +3,11 @@ #include "pkt-line.h" #include "tag.h" #include "object.h" +#include "commit.h" static const char upload_pack_usage[] = "git-upload-pack [--strict] [--timeout=nn] <dir>"; +#define THEY_HAVE (1U << 0) #define MAX_HAS 256 #define MAX_NEEDS 256 static int nr_has = 0, nr_needs = 0; @@ -85,15 +87,25 @@ static void create_pack_file(void) static int got_sha1(char *hex, unsigned char *sha1) { - int nr; if (get_sha1_hex(hex, sha1)) die("git-upload-pack: expected SHA1 object, got '%s'", hex); if (!has_sha1_file(sha1)) return 0; - nr = nr_has; - if (nr < MAX_HAS) { - memcpy(has_sha1[nr], sha1, 20); - nr_has = nr+1; + if (nr_has < MAX_HAS) { + struct object *o = lookup_object(sha1); + if (!o || (!o->parsed && !parse_object(sha1))) + die("oops (%s)", sha1_to_hex(sha1)); + if (o->type == commit_type) { + struct commit_list *parents; + if (o->flags & THEY_HAVE) + return 0; + o->flags |= THEY_HAVE; + for (parents = ((struct commit*)o)->parents; + parents; + parents = parents->next) + parents->item->object.flags |= THEY_HAVE; + } + memcpy(has_sha1[nr_has++], sha1, 20); } return 1; } @@ -104,6 +116,9 @@ static int get_common_commits(void) unsigned char sha1[20]; int len; + track_object_refs = 0; + save_commit_buffer = 0; + for(;;) { len = packet_read_line(0, line, sizeof(line)); reset_timeout(); |