Documentation/git-cherry-pick: Add --replay and --no-commit.

diff --git a/send-pack.c b/send-pack.c
index 0ab135c9881c4d9fa6b82ea80f5e62d2fbf17d28..f61c15c820facf936856c0af6be52a266b7e3dfd 100644 (file)
--- a/send-pack.c
+++ b/send-pack.c
@@ -126,12 +126,12 @@ static int ref_newer(const unsigned char *new_sha1,
        /* 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));
+       o = deref_tag(parse_object(old_sha1), NULL, 0);
        if (!o || o->type != commit_type)
                return 0;
        old = (struct commit *) o;
 
-       o = deref_tag(parse_object(new_sha1));
+       o = deref_tag(parse_object(new_sha1), NULL, 0);
        if (!o || o->type != commit_type)
                return 0;
        new = (struct commit *) o;
@@ -181,7 +181,7 @@ static int send_pack(int in, int out, int nr_refspec, char **refspec)
        int new_refs;
 
        /* 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 */
@@ -190,6 +190,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!
         */
@@ -206,7 +212,8 @@ static int send_pack(int in, int out, int nr_refspec, char **refspec)
                /* This part determines what can overwrite what.
                 * The rules are:
                 *
-                * (0) you can always use --force.
+                * (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.
                 *
@@ -218,16 +225,19 @@ static int send_pack(int in, int out, int nr_refspec, char **refspec)
                 *     descendant of old, it is OK.
                 */
 
-               if (!force_update && !is_zero_sha1(ref->old_sha1)) {
+               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 a old tag which points at
-                        * something you do not have which may or may not
+                        * 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,
@@ -269,6 +279,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;