X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=send-pack.c;h=0d41f9a1787429a1498ce82e1af7e7d93cea5a41;hb=353ce81597e831969ac37d6991346f8c39c1488e;hp=3eeb18f7c7d32412003ea665a47081dc06d84c95;hpb=72e5890b68e7199d92620d3bba91fa36dd259404;p=git.git diff --git a/send-pack.c b/send-pack.c index 3eeb18f7..0d41f9a1 100644 --- a/send-pack.c +++ b/send-pack.c @@ -8,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; @@ -179,6 +180,7 @@ 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, 1); @@ -190,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! */ @@ -199,7 +207,8 @@ static int send_pack(int in, int out, int nr_refspec, char **refspec) if (!ref->peer_ref) continue; if (!memcmp(ref->old_sha1, ref->peer_ref->new_sha1, 20)) { - fprintf(stderr, "'%s': up-to-date\n", ref->name); + if (verbose) + fprintf(stderr, "'%s': up-to-date\n", ref->name); continue; } @@ -222,29 +231,30 @@ static int send_pack(int in, int out, int nr_refspec, char **refspec) if (!force_update && !is_zero_sha1(ref->old_sha1) && !ref->force) { - 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; - } - - /* We assume that local is fsck-clean. Otherwise - * you _could_ have an old tag which points at - * something you do not have, which may or may not - * be a commit. - */ - if (!ref_newer(ref->peer_ref->new_sha1, + 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; } } 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++; @@ -260,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; } @@ -273,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; @@ -290,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) {