builtin-push.con commit Use 'fast-forward' all over the place (a75d7b5)
   1/*
   2 * "git push"
   3 */
   4#include "cache.h"
   5#include "refs.h"
   6#include "run-command.h"
   7#include "builtin.h"
   8#include "remote.h"
   9#include "transport.h"
  10#include "parse-options.h"
  11
  12static const char * const push_usage[] = {
  13        "git push [--all | --mirror] [-n | --dry-run] [--porcelain] [--tags] [--receive-pack=<git-receive-pack>] [--repo=<repository>] [-f | --force] [-v] [<repository> <refspec>...]",
  14        NULL,
  15};
  16
  17static int thin;
  18static const char *receivepack;
  19
  20static const char **refspec;
  21static int refspec_nr;
  22
  23static void add_refspec(const char *ref)
  24{
  25        int nr = refspec_nr + 1;
  26        refspec = xrealloc(refspec, nr * sizeof(char *));
  27        refspec[nr-1] = ref;
  28        refspec_nr = nr;
  29}
  30
  31static void set_refspecs(const char **refs, int nr)
  32{
  33        int i;
  34        for (i = 0; i < nr; i++) {
  35                const char *ref = refs[i];
  36                if (!strcmp("tag", ref)) {
  37                        char *tag;
  38                        int len;
  39                        if (nr <= ++i)
  40                                die("tag shorthand without <tag>");
  41                        len = strlen(refs[i]) + 11;
  42                        tag = xmalloc(len);
  43                        strcpy(tag, "refs/tags/");
  44                        strcat(tag, refs[i]);
  45                        ref = tag;
  46                }
  47                add_refspec(ref);
  48        }
  49}
  50
  51static void setup_push_tracking(void)
  52{
  53        struct strbuf refspec = STRBUF_INIT;
  54        struct branch *branch = branch_get(NULL);
  55        if (!branch)
  56                die("You are not currently on a branch.");
  57        if (!branch->merge_nr)
  58                die("The current branch %s is not tracking anything.",
  59                    branch->name);
  60        if (branch->merge_nr != 1)
  61                die("The current branch %s is tracking multiple branches, "
  62                    "refusing to push.", branch->name);
  63        strbuf_addf(&refspec, "%s:%s", branch->name, branch->merge[0]->src);
  64        add_refspec(refspec.buf);
  65}
  66
  67static void setup_default_push_refspecs(void)
  68{
  69        git_config(git_default_config, NULL);
  70        switch (push_default) {
  71        default:
  72        case PUSH_DEFAULT_MATCHING:
  73                add_refspec(":");
  74                break;
  75
  76        case PUSH_DEFAULT_TRACKING:
  77                setup_push_tracking();
  78                break;
  79
  80        case PUSH_DEFAULT_CURRENT:
  81                add_refspec("HEAD");
  82                break;
  83
  84        case PUSH_DEFAULT_NOTHING:
  85                die("You didn't specify any refspecs to push, and "
  86                    "push.default is \"nothing\".");
  87                break;
  88        }
  89}
  90
  91static int do_push(const char *repo, int flags)
  92{
  93        int i, errs;
  94        struct remote *remote = remote_get(repo);
  95        const char **url;
  96        int url_nr;
  97
  98        if (!remote) {
  99                if (repo)
 100                        die("bad repository '%s'", repo);
 101                die("No destination configured to push to.");
 102        }
 103
 104        if (remote->mirror)
 105                flags |= (TRANSPORT_PUSH_MIRROR|TRANSPORT_PUSH_FORCE);
 106
 107        if ((flags & TRANSPORT_PUSH_ALL) && refspec) {
 108                if (!strcmp(*refspec, "refs/tags/*"))
 109                        return error("--all and --tags are incompatible");
 110                return error("--all can't be combined with refspecs");
 111        }
 112
 113        if ((flags & TRANSPORT_PUSH_MIRROR) && refspec) {
 114                if (!strcmp(*refspec, "refs/tags/*"))
 115                        return error("--mirror and --tags are incompatible");
 116                return error("--mirror can't be combined with refspecs");
 117        }
 118
 119        if ((flags & (TRANSPORT_PUSH_ALL|TRANSPORT_PUSH_MIRROR)) ==
 120                                (TRANSPORT_PUSH_ALL|TRANSPORT_PUSH_MIRROR)) {
 121                return error("--all and --mirror are incompatible");
 122        }
 123
 124        if (!refspec && !(flags & TRANSPORT_PUSH_ALL)) {
 125                if (remote->push_refspec_nr) {
 126                        refspec = remote->push_refspec;
 127                        refspec_nr = remote->push_refspec_nr;
 128                } else if (!(flags & TRANSPORT_PUSH_MIRROR))
 129                        setup_default_push_refspecs();
 130        }
 131        errs = 0;
 132        if (remote->pushurl_nr) {
 133                url = remote->pushurl;
 134                url_nr = remote->pushurl_nr;
 135        } else {
 136                url = remote->url;
 137                url_nr = remote->url_nr;
 138        }
 139        for (i = 0; i < url_nr; i++) {
 140                struct transport *transport =
 141                        transport_get(remote, url[i]);
 142                int err;
 143                int nonfastforward;
 144                if (receivepack)
 145                        transport_set_option(transport,
 146                                             TRANS_OPT_RECEIVEPACK, receivepack);
 147                if (thin)
 148                        transport_set_option(transport, TRANS_OPT_THIN, "yes");
 149
 150                if (flags & TRANSPORT_PUSH_VERBOSE)
 151                        fprintf(stderr, "Pushing to %s\n", url[i]);
 152                err = transport_push(transport, refspec_nr, refspec, flags,
 153                                     &nonfastforward);
 154                err |= transport_disconnect(transport);
 155
 156                if (!err)
 157                        continue;
 158
 159                error("failed to push some refs to '%s'", url[i]);
 160                if (nonfastforward && advice_push_nonfastforward) {
 161                        printf("To prevent you from losing history, non-fast-forward updates were rejected\n"
 162                               "Merge the remote changes before pushing again.  See the 'non-fast-forward'\n"
 163                               "section of 'git push --help' for details.\n");
 164                }
 165                errs++;
 166        }
 167        return !!errs;
 168}
 169
 170int cmd_push(int argc, const char **argv, const char *prefix)
 171{
 172        int flags = 0;
 173        int tags = 0;
 174        int rc;
 175        const char *repo = NULL;        /* default repository */
 176
 177        struct option options[] = {
 178                OPT_BIT('q', "quiet", &flags, "be quiet", TRANSPORT_PUSH_QUIET),
 179                OPT_BIT('v', "verbose", &flags, "be verbose", TRANSPORT_PUSH_VERBOSE),
 180                OPT_STRING( 0 , "repo", &repo, "repository", "repository"),
 181                OPT_BIT( 0 , "all", &flags, "push all refs", TRANSPORT_PUSH_ALL),
 182                OPT_BIT( 0 , "mirror", &flags, "mirror all refs",
 183                            (TRANSPORT_PUSH_MIRROR|TRANSPORT_PUSH_FORCE)),
 184                OPT_BOOLEAN( 0 , "tags", &tags, "push tags"),
 185                OPT_BIT('n' , "dry-run", &flags, "dry run", TRANSPORT_PUSH_DRY_RUN),
 186                OPT_BIT( 0,  "porcelain", &flags, "machine-readable output", TRANSPORT_PUSH_PORCELAIN),
 187                OPT_BIT('f', "force", &flags, "force updates", TRANSPORT_PUSH_FORCE),
 188                OPT_BOOLEAN( 0 , "thin", &thin, "use thin pack"),
 189                OPT_STRING( 0 , "receive-pack", &receivepack, "receive-pack", "receive pack program"),
 190                OPT_STRING( 0 , "exec", &receivepack, "receive-pack", "receive pack program"),
 191                OPT_END()
 192        };
 193
 194        argc = parse_options(argc, argv, prefix, options, push_usage, 0);
 195
 196        if (tags)
 197                add_refspec("refs/tags/*");
 198
 199        if (argc > 0) {
 200                repo = argv[0];
 201                set_refspecs(argv + 1, argc - 1);
 202        }
 203
 204        rc = do_push(repo, flags);
 205        if (rc == -1)
 206                usage_with_options(push_usage, options);
 207        else
 208                return rc;
 209}