[PATCH] fetch-pack should not ask for a ref which is already there
From: Johannes Schindelin <hidden>
Date: 2016-06-15 22:42:07
Subsystem:
the rest · Maintainer:
Linus Torvalds
With this patch, instead of blindly asking for every remote ref, fetch-pack first looks in the local repository if that ref is already there. Signed-off-by: Johannes Schindelin <redacted> --- fetch-pack.c | 30 ++++++++++++++++++++---------- 1 files changed, 20 insertions(+), 10 deletions(-) 6bf41421bed0d640677c5233d2be6813b2211979
diff --git a/fetch-pack.c b/fetch-pack.c
--- a/fetch-pack.c
+++ b/fetch-pack.c@@ -16,20 +16,27 @@ static int find_common(int fd[2], unsign int count = 0, flushes = 0, retval; FILE *revs; - revs = popen("git-rev-list $(git-rev-parse --all)", "r"); - if (!revs) - die("unable to run 'git-rev-list'"); - while (refs) { unsigned char *remote = refs->old_sha1; - if (verbose) - fprintf(stderr, - "want %s (%s)\n", sha1_to_hex(remote), - refs->name); - packet_write(fd[1], "want %s\n", sha1_to_hex(remote)); + if(!has_sha1_file(remote)) { + if (verbose) + fprintf(stderr, + "want %s (%s)\n", sha1_to_hex(remote), + refs->name); + packet_write(fd[1], "want %s\n", sha1_to_hex(remote)); + count++; + } refs = refs->next; } packet_flush(fd[1]); + + if(count==0) + return 1; + + revs = popen("git-rev-list $(git-rev-parse --all)", "r"); + if (!revs) + die("unable to run 'git-rev-list'"); + flushes = 1; retval = -1; while (fgets(line, sizeof(line), revs) != NULL) {
@@ -86,7 +93,10 @@ static int fetch_pack(int fd[2], int nr_ packet_flush(fd[1]); die("no matching remote head"); } - if (find_common(fd, sha1, ref) < 0) + status = find_common(fd, sha1, ref); + if(status > 0) + return 0; + if(status < 0) fprintf(stderr, "warning: no common commits\n"); pid = fork(); if (pid < 0)