Merge branch 'jk/maint-push-tracking-wo-remote' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 8 Mar 2010 08:36:01 +0000 (00:36 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 8 Mar 2010 08:36:01 +0000 (00:36 -0800)
* jk/maint-push-tracking-wo-remote:
push: fix segfault for odd config

1  2 
builtin-push.c
diff --combined builtin-push.c
index 5633f0ade49f7c845665b7aab202be18a8cc9d8d,041e5f46086154c7b879c8bda56ef07553750a78..f7bc2b292fb85725d9cc26ce09f2302aaa7167fe
  #include "parse-options.h"
  
  static const char * const push_usage[] = {
 -      "git push [--all | --mirror] [--dry-run] [--tags] [--receive-pack=<git-receive-pack>] [--repo=<repository>] [-f | --force] [-v] [<repository> <refspec>...]",
 +      "git push [<options>] [<repository> <refspec>...]",
        NULL,
  };
  
  static int thin;
 +static int deleterefs;
  static const char *receivepack;
  
  static const char **refspec;
@@@ -40,24 -39,11 +40,24 @@@ static void set_refspecs(const char **r
                        if (nr <= ++i)
                                die("tag shorthand without <tag>");
                        len = strlen(refs[i]) + 11;
 -                      tag = xmalloc(len);
 -                      strcpy(tag, "refs/tags/");
 +                      if (deleterefs) {
 +                              tag = xmalloc(len+1);
 +                              strcpy(tag, ":refs/tags/");
 +                      } else {
 +                              tag = xmalloc(len);
 +                              strcpy(tag, "refs/tags/");
 +                      }
                        strcat(tag, refs[i]);
                        ref = tag;
 -              }
 +              } else if (deleterefs && !strchr(ref, ':')) {
 +                      char *delref;
 +                      int len = strlen(ref)+1;
 +                      delref = xmalloc(len+1);
 +                      strcpy(delref, ":");
 +                      strcat(delref, ref);
 +                      ref = delref;
 +              } else if (deleterefs)
 +                      die("--delete only accepts plain target ref names");
                add_refspec(ref);
        }
  }
@@@ -68,7 -54,7 +68,7 @@@ static void setup_push_tracking(void
        struct branch *branch = branch_get(NULL);
        if (!branch)
                die("You are not currently on a branch.");
-       if (!branch->merge_nr)
+       if (!branch->merge_nr || !branch->merge)
                die("The current branch %s is not tracking anything.",
                    branch->name);
        if (branch->merge_nr != 1)
  
  static void setup_default_push_refspecs(void)
  {
 -      git_config(git_default_config, NULL);
        switch (push_default) {
 -      case PUSH_DEFAULT_UNSPECIFIED:
 -              /* fallthrough */
 -
 +      default:
        case PUSH_DEFAULT_MATCHING:
                add_refspec(":");
                break;
        }
  }
  
 +static int push_with_options(struct transport *transport, int flags)
 +{
 +      int err;
 +      int nonfastforward;
 +      if (receivepack)
 +              transport_set_option(transport,
 +                                   TRANS_OPT_RECEIVEPACK, receivepack);
 +      if (thin)
 +              transport_set_option(transport, TRANS_OPT_THIN, "yes");
 +
 +      if (flags & TRANSPORT_PUSH_VERBOSE)
 +              fprintf(stderr, "Pushing to %s\n", transport->url);
 +      err = transport_push(transport, refspec_nr, refspec, flags,
 +                           &nonfastforward);
 +      if (err != 0)
 +              error("failed to push some refs to '%s'", transport->url);
 +
 +      err |= transport_disconnect(transport);
 +
 +      if (!err)
 +              return 0;
 +
 +      if (nonfastforward && advice_push_nonfastforward) {
 +              printf("To prevent you from losing history, non-fast-forward updates were rejected\n"
 +                     "Merge the remote changes before pushing again.  See the 'Note about\n"
 +                     "fast-forwards' section of 'git push --help' for details.\n");
 +      }
 +
 +      return 1;
 +}
 +
  static int do_push(const char *repo, int flags)
  {
        int i, errs;
        struct remote *remote = remote_get(repo);
 +      const char **url;
 +      int url_nr;
  
 -      if (!remote)
 -              die("bad repository '%s'", repo);
 +      if (!remote) {
 +              if (repo)
 +                      die("bad repository '%s'", repo);
 +              die("No destination configured to push to.");
 +      }
  
        if (remote->mirror)
                flags |= (TRANSPORT_PUSH_MIRROR|TRANSPORT_PUSH_FORCE);
                        setup_default_push_refspecs();
        }
        errs = 0;
 -      for (i = 0; i < remote->url_nr; i++) {
 +      if (remote->pushurl_nr) {
 +              url = remote->pushurl;
 +              url_nr = remote->pushurl_nr;
 +      } else {
 +              url = remote->url;
 +              url_nr = remote->url_nr;
 +      }
 +      if (url_nr) {
 +              for (i = 0; i < url_nr; i++) {
 +                      struct transport *transport =
 +                              transport_get(remote, url[i]);
 +                      if (push_with_options(transport, flags))
 +                              errs++;
 +              }
 +      } else {
                struct transport *transport =
 -                      transport_get(remote, remote->url[i]);
 -              int err;
 -              if (receivepack)
 -                      transport_set_option(transport,
 -                                           TRANS_OPT_RECEIVEPACK, receivepack);
 -              if (thin)
 -                      transport_set_option(transport, TRANS_OPT_THIN, "yes");
 -
 -              if (flags & TRANSPORT_PUSH_VERBOSE)
 -                      fprintf(stderr, "Pushing to %s\n", remote->url[i]);
 -              err = transport_push(transport, refspec_nr, refspec, flags);
 -              err |= transport_disconnect(transport);
 -
 -              if (!err)
 -                      continue;
 -
 -              error("failed to push some refs to '%s'", remote->url[i]);
 -              errs++;
 +                      transport_get(remote, NULL);
 +
 +              if (push_with_options(transport, flags))
 +                      errs++;
        }
        return !!errs;
  }
@@@ -203,33 -156,23 +203,33 @@@ int cmd_push(int argc, const char **arg
        int tags = 0;
        int rc;
        const char *repo = NULL;        /* default repository */
 -
        struct option options[] = {
 +              OPT_BIT('q', "quiet", &flags, "be quiet", TRANSPORT_PUSH_QUIET),
                OPT_BIT('v', "verbose", &flags, "be verbose", TRANSPORT_PUSH_VERBOSE),
                OPT_STRING( 0 , "repo", &repo, "repository", "repository"),
                OPT_BIT( 0 , "all", &flags, "push all refs", TRANSPORT_PUSH_ALL),
                OPT_BIT( 0 , "mirror", &flags, "mirror all refs",
                            (TRANSPORT_PUSH_MIRROR|TRANSPORT_PUSH_FORCE)),
 -              OPT_BOOLEAN( 0 , "tags", &tags, "push tags"),
 -              OPT_BIT( 0 , "dry-run", &flags, "dry run", TRANSPORT_PUSH_DRY_RUN),
 +              OPT_BOOLEAN( 0, "delete", &deleterefs, "delete refs"),
 +              OPT_BOOLEAN( 0 , "tags", &tags, "push tags (can't be used with --all or --mirror)"),
 +              OPT_BIT('n' , "dry-run", &flags, "dry run", TRANSPORT_PUSH_DRY_RUN),
 +              OPT_BIT( 0,  "porcelain", &flags, "machine-readable output", TRANSPORT_PUSH_PORCELAIN),
                OPT_BIT('f', "force", &flags, "force updates", TRANSPORT_PUSH_FORCE),
                OPT_BOOLEAN( 0 , "thin", &thin, "use thin pack"),
                OPT_STRING( 0 , "receive-pack", &receivepack, "receive-pack", "receive pack program"),
                OPT_STRING( 0 , "exec", &receivepack, "receive-pack", "receive pack program"),
 +              OPT_BIT('u', "set-upstream", &flags, "set upstream for git pull/status",
 +                      TRANSPORT_PUSH_SET_UPSTREAM),
                OPT_END()
        };
  
 -      argc = parse_options(argc, argv, options, push_usage, 0);
 +      git_config(git_default_config, NULL);
 +      argc = parse_options(argc, argv, prefix, options, push_usage, 0);
 +
 +      if (deleterefs && (tags || (flags & (TRANSPORT_PUSH_ALL | TRANSPORT_PUSH_MIRROR))))
 +              die("--delete is incompatible with --all, --mirror and --tags");
 +      if (deleterefs && argc < 2)
 +              die("--delete doesn't make sense without any refs");
  
        if (tags)
                add_refspec("refs/tags/*");