X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=sidebyside;f=send-pack.c;h=0d41f9a1787429a1498ce82e1af7e7d93cea5a41;hb=d5a6aafc90a14382120727e4e81ee1a380e8b194;hp=633fc471afb10191a1f47874e3e2ff9ebd0a6071;hpb=f88395ac233572b19f67b3a47b9fe024f397a85b;p=git.git diff --git a/send-pack.c b/send-pack.c index 633fc471..0d41f9a1 100644 --- a/send-pack.c +++ b/send-pack.c @@ -1,5 +1,6 @@ #include "cache.h" #include "commit.h" +#include "tag.h" #include "refs.h" #include "pkt-line.h" @@ -7,6 +8,7 @@ static const char send_pack_usage[] = "git-send-pack [--all] [--exec=git-receive-pack] [...]\n" " --all and explicit specification are mutually exclusive."; static const char *exec = "git-receive-pack"; +static int verbose = 0; static int send_all = 0; static int force_update = 0; @@ -104,29 +106,53 @@ static int pack_objects(int fd, struct ref *refs) return 0; } -static int ref_newer(const unsigned char *new_sha1, const unsigned char *old_sha1) +static void unmark_and_free(struct commit_list *list, unsigned int mark) { - struct commit *new, *old; - struct commit_list *list; + while (list) { + struct commit_list *temp = list; + temp->item->object.flags &= ~mark; + list = temp->next; + free(temp); + } +} - if (force_update) - return 1; - old = lookup_commit_reference(old_sha1); - if (!old) +static int ref_newer(const unsigned char *new_sha1, + const unsigned char *old_sha1) +{ + struct object *o; + struct commit *old, *new; + struct commit_list *list, *used; + int found = 0; + + /* Both new and old must be commit-ish and new is descendant of + * old. Otherwise we require --force. + */ + o = deref_tag(parse_object(old_sha1), NULL, 0); + if (!o || o->type != commit_type) return 0; - new = lookup_commit_reference(new_sha1); - if (!new) + old = (struct commit *) o; + + o = deref_tag(parse_object(new_sha1), NULL, 0); + if (!o || o->type != commit_type) return 0; + new = (struct commit *) o; + if (parse_commit(new) < 0) return 0; - list = NULL; + + used = list = NULL; commit_list_insert(new, &list); while (list) { new = pop_most_recent_commit(&list, 1); - if (new == old) - return 1; + commit_list_insert(new, &used); + if (new == old) { + found = 1; + break; + } } - return 0; + unmark_and_free(list, 1); + unmark_and_free(used, 1); + return found; } static struct ref *local_refs, **local_tail; @@ -154,9 +180,10 @@ static int send_pack(int in, int out, int nr_refspec, char **refspec) { struct ref *ref; int new_refs; + int ret = 0; /* No funny business with the matcher */ - remote_tail = get_remote_heads(in, &remote_refs, 0, NULL); + remote_tail = get_remote_heads(in, &remote_refs, 0, NULL, 1); get_local_heads(); /* match them up */ @@ -165,6 +192,12 @@ static int send_pack(int in, int out, int nr_refspec, char **refspec) if (match_refs(local_refs, remote_refs, &remote_tail, nr_refspec, refspec, send_all)) return -1; + + if (!remote_refs) { + fprintf(stderr, "No refs in common and none specified; doing nothing.\n"); + return 0; + } + /* * Finally, tell the other end! */ @@ -173,28 +206,55 @@ static int send_pack(int in, int out, int nr_refspec, char **refspec) char old_hex[60], *new_hex; if (!ref->peer_ref) continue; - if (!is_zero_sha1(ref->old_sha1)) { - if (!has_sha1_file(ref->old_sha1)) { - error("remote '%s' object %s does not " - "exist on local", - ref->name, sha1_to_hex(ref->old_sha1)); - continue; - } - if (!ref_newer(ref->peer_ref->new_sha1, + if (!memcmp(ref->old_sha1, ref->peer_ref->new_sha1, 20)) { + if (verbose) + fprintf(stderr, "'%s': up-to-date\n", ref->name); + continue; + } + + /* This part determines what can overwrite what. + * The rules are: + * + * (0) you can always use --force or +A:B notation to + * selectively force individual ref pairs. + * + * (1) if the old thing does not exist, it is OK. + * + * (2) if you do not have the old thing, you are not allowed + * to overwrite it; you would not know what you are losing + * otherwise. + * + * (3) if both new and old are commit-ish, and new is a + * descendant of old, it is OK. + */ + + if (!force_update && + !is_zero_sha1(ref->old_sha1) && + !ref->force) { + if (!has_sha1_file(ref->old_sha1) || + !ref_newer(ref->peer_ref->new_sha1, ref->old_sha1)) { - error("remote ref '%s' is not a strict " - "subset of local ref '%s'.", ref->name, + /* We do not have the remote ref, or + * we know that the remote ref is not + * an ancestor of what we are trying to + * push. Either way this can be losing + * commits at the remote end and likely + * we were not up to date to begin with. + */ + error("remote '%s' is not a strict " + "subset of local ref '%s'. " + "maybe you are not up-to-date and " + "need to pull first?", + ref->name, ref->peer_ref->name); + ret = -2; continue; } } - if (!memcmp(ref->old_sha1, ref->peer_ref->new_sha1, 20)) { - fprintf(stderr, "'%s': up-to-date\n", ref->name); - continue; - } memcpy(ref->new_sha1, ref->peer_ref->new_sha1, 20); if (is_zero_sha1(ref->new_sha1)) { error("cannot happen anymore"); + ret = -3; continue; } new_refs++; @@ -210,8 +270,10 @@ static int send_pack(int in, int out, int nr_refspec, char **refspec) packet_flush(out); if (new_refs) pack_objects(out, remote_refs); + else if (ret == 0) + fprintf(stderr, "Everything up-to-date\n"); close(out); - return 0; + return ret; } @@ -223,6 +285,7 @@ int main(int argc, char **argv) int fd[2], ret; pid_t pid; + setup_git_directory(); argv++; for (i = 1; i < argc; i++, argv++) { char *arg = *argv; @@ -240,6 +303,10 @@ int main(int argc, char **argv) force_update = 1; continue; } + if (!strcmp(arg, "--verbose")) { + verbose = 1; + continue; + } usage(send_pack_usage); } if (!dest) {