summaryrefslogtreecommitdiff
path: root/upload-pack.c
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2005-10-28 02:48:32 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-10-29 05:56:59 (GMT)
commitf0243f26f6d8403cd8e83c7d498c81e01a1f1735 (patch)
tree54bd7d9209f630a745350edc446a954de6ba632b /upload-pack.c
parenteebda31d21d5d5df351b41994df875918863294e (diff)
downloadgit-f0243f26f6d8403cd8e83c7d498c81e01a1f1735.zip
git-f0243f26f6d8403cd8e83c7d498c81e01a1f1735.tar.gz
git-f0243f26f6d8403cd8e83c7d498c81e01a1f1735.tar.bz2
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.c27
1 files changed, 22 insertions, 5 deletions
diff --git a/upload-pack.c b/upload-pack.c
index 878254d..660d7c4 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 OUR_REF (1U << 1)
#define WANTED (1U << 2)
#define MAX_HAS 256
@@ -89,15 +91,27 @@ 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))
+ o = parse_object(sha1);
+ if (!o)
+ 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;
}
@@ -108,6 +122,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();