git-cvsimport: fix merging with remote parent branch
[git/jnareb-git.git] / builtin-push.c
blob9f727c00f689ae23373502c7fb21b2234a1c1748
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"
12 static const char * const push_usage[] = {
13 "git-push [--all | --mirror] [--dry-run] [--tags] [--receive-pack=<git-receive-pack>] [--repo=all] [-f | --force] [-v] [<repository> <refspec>...]",
14 NULL,
17 static int thin, verbose;
18 static const char *receivepack;
20 static const char **refspec;
21 static int refspec_nr;
23 static void add_refspec(const char *ref)
25 int nr = refspec_nr + 1;
26 refspec = xrealloc(refspec, nr * sizeof(char *));
27 refspec[nr-1] = ref;
28 refspec_nr = nr;
31 static void set_refspecs(const char **refs, int nr)
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;
47 if (!strcmp("HEAD", ref)) {
48 unsigned char sha1_dummy[20];
49 ref = resolve_ref(ref, sha1_dummy, 1, NULL);
50 if (!ref)
51 die("HEAD cannot be resolved.");
52 if (prefixcmp(ref, "refs/heads/"))
53 die("HEAD cannot be resolved to branch.");
54 ref = xstrdup(ref + 11);
56 add_refspec(ref);
60 static int do_push(const char *repo, int flags)
62 int i, errs;
63 struct remote *remote = remote_get(repo);
65 if (!remote)
66 die("bad repository '%s'", repo);
68 if (!refspec
69 && !(flags & TRANSPORT_PUSH_ALL)
70 && remote->push_refspec_nr) {
71 refspec = remote->push_refspec;
72 refspec_nr = remote->push_refspec_nr;
74 errs = 0;
75 for (i = 0; i < remote->url_nr; i++) {
76 struct transport *transport =
77 transport_get(remote, remote->url[i]);
78 int err;
79 if (receivepack)
80 transport_set_option(transport,
81 TRANS_OPT_RECEIVEPACK, receivepack);
82 if (thin)
83 transport_set_option(transport, TRANS_OPT_THIN, "yes");
85 if (verbose)
86 fprintf(stderr, "Pushing to %s\n", remote->url[i]);
87 err = transport_push(transport, refspec_nr, refspec, flags);
88 err |= transport_disconnect(transport);
90 if (!err)
91 continue;
93 error("failed to push some refs to '%s'", remote->url[i]);
94 errs++;
96 return !!errs;
99 int cmd_push(int argc, const char **argv, const char *prefix)
101 int flags = 0;
102 int all = 0;
103 int mirror = 0;
104 int dry_run = 0;
105 int force = 0;
106 int tags = 0;
107 const char *repo = NULL; /* default repository */
109 struct option options[] = {
110 OPT__VERBOSE(&verbose),
111 OPT_STRING( 0 , "repo", &repo, "repository", "repository"),
112 OPT_BOOLEAN( 0 , "all", &all, "push all refs"),
113 OPT_BOOLEAN( 0 , "mirror", &mirror, "mirror all refs"),
114 OPT_BOOLEAN( 0 , "tags", &tags, "push tags"),
115 OPT_BOOLEAN( 0 , "dry-run", &dry_run, "dry run"),
116 OPT_BOOLEAN('f', "force", &force, "force updates"),
117 OPT_BOOLEAN( 0 , "thin", &thin, "use thin pack"),
118 OPT_STRING( 0 , "receive-pack", &receivepack, "receive-pack", "receive pack program"),
119 OPT_STRING( 0 , "exec", &receivepack, "receive-pack", "receive pack program"),
120 OPT_END()
123 argc = parse_options(argc, argv, options, push_usage, 0);
125 if (force)
126 flags |= TRANSPORT_PUSH_FORCE;
127 if (dry_run)
128 flags |= TRANSPORT_PUSH_DRY_RUN;
129 if (verbose)
130 flags |= TRANSPORT_PUSH_VERBOSE;
131 if (tags)
132 add_refspec("refs/tags/*");
133 if (all)
134 flags |= TRANSPORT_PUSH_ALL;
135 if (mirror)
136 flags |= (TRANSPORT_PUSH_MIRROR|TRANSPORT_PUSH_FORCE);
138 if (argc > 0) {
139 repo = argv[0];
140 set_refspecs(argv + 1, argc - 1);
142 if ((flags & (TRANSPORT_PUSH_ALL|TRANSPORT_PUSH_MIRROR)) && refspec)
143 usage_with_options(push_usage, options);
145 if ((flags & (TRANSPORT_PUSH_ALL|TRANSPORT_PUSH_MIRROR)) ==
146 (TRANSPORT_PUSH_ALL|TRANSPORT_PUSH_MIRROR)) {
147 error("--all and --mirror are incompatible");
148 usage_with_options(push_usage, options);
151 return do_push(repo, flags);