@matheusbsbs / matheus-bagliano / commits / 2759cbc774
Fork 0

git-fetch-pack: avoid unnecessary zero packing

If everything is up-to-date locally, we don't need to even ask for a pack-file from the remote, or try to unpack it. This is especially important for tags - since the pack-file common commit logic is based purely on the commit history, it will never be able to find a common tag, and will thus always end up re-fetching them. Especially notably, if the tag points to a non-commit (eg a tagged tree), the pack-file would be unnecessarily big, just because it cannot any most recent common point between commits for pruning. Short-circuiting the case where we already have that reference means that we avoid a lot of these in the common case. NOTE! This only matches remote ref names against the same local name, which works well for tags, but is not as generic as it could be. If we ever need to, we could match against _any_ local ref (if we have it, we have it), but this "match against same name" is simpler and more efficient, and covers the common case. Renaming of refs is common for branch heads, but since those are always commits, the pack-file generation can optimize that case. In some cases we might still end up fetching pack-files unnecessarily, but this at least avoids the re-fetching of tags over and over if you use a regular git fetch --tags ... which was the main reason behind the change. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>

Linus Torvalds committed Oct 18, 2005 at 11:35 UTC 2759cbc7741d7ce7bf44c2433fa1312d3fc7e64a
1 file changed +44 -6
fetch-pack.c
+44 -6
@@ -12,6 +12,7 @@ static const char *exec = "git-upload-pack";
12 static int find_common(int fd[2], unsigned char *result_sha1,
13 struct ref *refs)
14 {
15 + int fetching;
16 static char line[1000];
17 int count = 0, flushes = 0, retval;
18 FILE *revs;
@@ -20,16 +21,19 @@ static int find_common(int fd[2], unsigned char *result_sha1,
21 if (!revs)
22 die("unable to run 'git-rev-list'");
23
23 - while (refs) {
24 + fetching = 0;
25 + for ( ; refs ; refs = refs->next) {
26 unsigned char *remote = refs->old_sha1;
25 - if (verbose)
26 - fprintf(stderr,
27 - "want %s (%s)\n", sha1_to_hex(remote),
28 - refs->name);
27 + unsigned char *local = refs->new_sha1;
28 +
29 + if (!memcmp(remote, local, 20))
30 + continue;
31 packet_write(fd[1], "want %s\n", sha1_to_hex(remote));
30 - refs = refs->next;
32 + fetching++;
33 }
34 packet_flush(fd[1]);
35 + if (!fetching)
36 + return 1;
37 flushes = 1;
38 retval = -1;
39 while (fgets(line, sizeof(line), revs) != NULL) {
@@ -74,6 +78,35 @@ static int find_common(int fd[2], unsigned char *result_sha1,
78 return retval;
79 }
80
81 +static int everything_local(struct ref *refs)
82 +{
83 + int retval;
84 +
85 + for (retval = 1; refs ; refs = refs->next) {
86 + const unsigned char *remote = refs->old_sha1;
87 + unsigned char local[20];
88 +
89 + if (read_ref(git_path("%s", refs->name), local) < 0 ||
90 + memcmp(remote, local, 20)) {
91 + retval = 0;
92 + if (!verbose)
93 + continue;
94 + fprintf(stderr,
95 + "want %s (%s)\n", sha1_to_hex(remote),
96 + refs->name);
97 + continue;
98 + }
99 +
100 + memcpy(refs->new_sha1, local, 20);
101 + if (!verbose)
102 + continue;
103 + fprintf(stderr,
104 + "already have %s (%s)\n", sha1_to_hex(remote),
105 + refs->name);
106 + }
107 + return retval;
108 +}
109 +
110 static int fetch_pack(int fd[2], int nr_match, char **match)
111 {
112 struct ref *ref;
@@ -86,6 +119,10 @@ static int fetch_pack(int fd[2], int nr_match, char **match)
119 packet_flush(fd[1]);
120 die("no matching remote head");
121 }
122 + if (everything_local(ref)) {
123 + packet_flush(fd[1]);
124 + goto all_done;
125 + }
126 if (find_common(fd, sha1, ref) < 0)
127 fprintf(stderr, "warning: no common commits\n");
128 pid = fork();
@@ -109,6 +146,7 @@ static int fetch_pack(int fd[2], int nr_match, char **match)
146 int code = WEXITSTATUS(status);
147 if (code)
148 die("git-unpack-objects died with error code %d", code);
149 +all_done:
150 while (ref) {
151 printf("%s %s\n",
152 sha1_to_hex(ref->old_sha1), ref->name);