#include "cache.h"
+#include "commit.h"
+#include "refs.h"
#include "pkt-line.h"
-static const char send_pack_usage[] = "git-send-pack [--exec=other] destination [heads]*";
+static const char send_pack_usage[] =
+"git-send-pack [--exec=git-receive-pack] [host:]directory [heads]*";
static const char *exec = "git-receive-pack";
+static int send_all = 0;
+static int force_update = 0;
-struct ref {
- struct ref *next;
- unsigned char old_sha1[20];
- unsigned char new_sha1[20];
- char name[0];
-};
+static int is_zero_sha1(const unsigned char *sha1)
+{
+ int i;
+
+ for (i = 0; i < 20; i++) {
+ if (*sha1++)
+ return 0;
+ }
+ return 1;
+}
static void exec_pack_objects(void)
{
char *buf = malloc(100);
if (i > 900)
die("git-rev-list environment overflow");
- args[i++] = buf;
- snprintf(buf, 50, "^%s", sha1_to_hex(refs->old_sha1));
- buf += 50;
- args[i++] = buf;
- snprintf(buf, 50, "%s", sha1_to_hex(refs->new_sha1));
+ if (!is_zero_sha1(refs->old_sha1)) {
+ args[i++] = buf;
+ snprintf(buf, 50, "^%s", sha1_to_hex(refs->old_sha1));
+ buf += 50;
+ }
+ if (!is_zero_sha1(refs->new_sha1)) {
+ args[i++] = buf;
+ snprintf(buf, 50, "%s", sha1_to_hex(refs->new_sha1));
+ }
refs = refs->next;
}
args[i] = NULL;
return ret;
}
+static int ref_newer(const unsigned char *new_sha1, const unsigned char *old_sha1)
+{
+ struct commit *new, *old;
+ struct commit_list *list;
+
+ if (force_update)
+ return 1;
+ old = lookup_commit_reference(old_sha1);
+ if (!old)
+ return 0;
+ new = lookup_commit_reference(new_sha1);
+ if (!new)
+ return 0;
+ if (parse_commit(new) < 0)
+ return 0;
+ list = NULL;
+ commit_list_insert(new, &list);
+ while ((new = pop_most_recent_commit(&list, 1)) != NULL) {
+ if (new == old)
+ return 1;
+ }
+ return 0;
+}
+
+static int local_ref_nr_match;
+static char **local_ref_match;
+static struct ref *local_ref_list;
+static struct ref **local_last_ref;
+
+static int try_to_match(const char *refname, const unsigned char *sha1)
+{
+ struct ref *ref;
+ int len;
+
+ if (!path_match(refname, local_ref_nr_match, local_ref_match)) {
+ if (!send_all)
+ return 0;
+
+ /* If we have it listed already, skip it */
+ for (ref = local_ref_list ; ref ; ref = ref->next) {
+ if (!strcmp(ref->name, refname))
+ return 0;
+ }
+ }
+
+ len = strlen(refname)+1;
+ ref = xmalloc(sizeof(*ref) + len);
+ memset(ref->old_sha1, 0, 20);
+ memcpy(ref->new_sha1, sha1, 20);
+ memcpy(ref->name, refname, len);
+ ref->next = NULL;
+ *local_last_ref = ref;
+ local_last_ref = &ref->next;
+ return 0;
+}
+
static int send_pack(int in, int out, int nr_match, char **match)
{
- struct ref *ref_list = NULL, **last_ref = &ref_list;
+ struct ref *ref_list, **last_ref;
struct ref *ref;
+ int new_refs;
+
+ /* First we get all heads, whether matching or not.. */
+ last_ref = get_remote_heads(in, &ref_list, 0, NULL);
- for (;;) {
- unsigned char old_sha1[20];
+ /*
+ * Go through the refs, see if we want to update
+ * any of them..
+ */
+ for (ref = ref_list; ref; ref = ref->next) {
unsigned char new_sha1[20];
- static char buffer[1000];
- char *name;
- int len;
-
- len = packet_read_line(in, buffer, sizeof(buffer));
- if (!len)
- break;
- if (buffer[len-1] == '\n')
- buffer[--len] = 0;
-
- if (len < 42 || get_sha1_hex(buffer, old_sha1) || buffer[40] != ' ')
- die("protocol error: expected sha/ref, got '%s'", buffer);
- name = buffer + 41;
+ char *name = ref->name;
+
if (nr_match && !path_match(name, nr_match, match))
continue;
+
if (read_ref(name, new_sha1) < 0)
- return error("no such local reference '%s'", name);
- if (!has_sha1_file(old_sha1))
- return error("remote '%s' points to object I don't have", name);
- if (!memcmp(old_sha1, new_sha1, 20)) {
+ continue;
+
+ if (!memcmp(ref->old_sha1, new_sha1, 20)) {
fprintf(stderr, "'%s' unchanged\n", name);
continue;
}
- ref = xmalloc(sizeof(*ref) + len - 40);
- memcpy(ref->old_sha1, old_sha1, 20);
+
+ if (!ref_newer(new_sha1, ref->old_sha1)) {
+ error("remote '%s' isn't a strict parent of local", name);
+ continue;
+ }
+
+ /* Ok, mark it for update */
memcpy(ref->new_sha1, new_sha1, 20);
- memcpy(ref->name, buffer + 41, len - 40);
- ref->next = NULL;
- *last_ref = ref;
- last_ref = &ref->next;
}
+ /*
+ * See if we have any refs that the other end didn't have
+ */
+ if (nr_match) {
+ local_ref_nr_match = nr_match;
+ local_ref_match = match;
+ local_ref_list = ref_list;
+ local_last_ref = last_ref;
+ for_each_ref(try_to_match);
+ }
+
+ /*
+ * Finally, tell the other end!
+ */
+ new_refs = 0;
for (ref = ref_list; ref; ref = ref->next) {
char old_hex[60], *new_hex;
+ if (is_zero_sha1(ref->new_sha1))
+ continue;
+ new_refs++;
strcpy(old_hex, sha1_to_hex(ref->old_sha1));
new_hex = sha1_to_hex(ref->new_sha1);
packet_write(out, "%s %s %s", old_hex, new_hex, ref->name);
}
packet_flush(out);
- if (ref_list)
+ if (new_refs)
pack_objects(out, ref_list);
close(out);
return 0;
pid_t pid;
argv++;
- for (i = 1; i < argc; i++) {
- char *arg = *argv++;
+ for (i = 1; i < argc; i++, argv++) {
+ char *arg = *argv;
if (*arg == '-') {
if (!strncmp(arg, "--exec=", 7)) {
exec = arg + 7;
continue;
}
+ if (!strcmp(arg, "--all")) {
+ send_all = 1;
+ continue;
+ }
+ if (!strcmp(arg, "--force")) {
+ force_update = 1;
+ continue;
+ }
usage(send_pack_usage);
}
- dest = arg;
+ if (!dest) {
+ dest = arg;
+ continue;
+ }
heads = argv;
- nr_heads = argc - i -1;
+ nr_heads = argc - i;
break;
}
if (!dest)