tests for "git add ignored-dir/file" without -f
[tgit.git] / builtin-push.c
blobdcfb53f1884d2648993214b4378afbd1f83760b0
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 [<options>] [<repository> <refspec>...]",
14 NULL,
17 static int thin;
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 add_refspec(ref);
51 static void setup_push_tracking(void)
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);
67 static void setup_default_push_refspecs(void)
69 switch (push_default) {
70 default:
71 case PUSH_DEFAULT_MATCHING:
72 add_refspec(":");
73 break;
75 case PUSH_DEFAULT_TRACKING:
76 setup_push_tracking();
77 break;
79 case PUSH_DEFAULT_CURRENT:
80 add_refspec("HEAD");
81 break;
83 case PUSH_DEFAULT_NOTHING:
84 die("You didn't specify any refspecs to push, and "
85 "push.default is \"nothing\".");
86 break;
90 static int push_with_options(struct transport *transport, int flags)
92 int err;
93 int nonfastforward;
94 if (receivepack)
95 transport_set_option(transport,
96 TRANS_OPT_RECEIVEPACK, receivepack);
97 if (thin)
98 transport_set_option(transport, TRANS_OPT_THIN, "yes");
100 if (flags & TRANSPORT_PUSH_VERBOSE)
101 fprintf(stderr, "Pushing to %s\n", transport->url);
102 err = transport_push(transport, refspec_nr, refspec, flags,
103 &nonfastforward);
104 if (err != 0)
105 error("failed to push some refs to '%s'", transport->url);
107 err |= transport_disconnect(transport);
109 if (!err)
110 return 0;
112 if (nonfastforward && advice_push_nonfastforward) {
113 printf("To prevent you from losing history, non-fast-forward updates were rejected\n"
114 "Merge the remote changes before pushing again. See the 'non-fast-forward'\n"
115 "section of 'git push --help' for details.\n");
118 return 1;
121 static int do_push(const char *repo, int flags)
123 int i, errs;
124 struct remote *remote = remote_get(repo);
125 const char **url;
126 int url_nr;
128 if (!remote) {
129 if (repo)
130 die("bad repository '%s'", repo);
131 die("No destination configured to push to.");
134 if (remote->mirror)
135 flags |= (TRANSPORT_PUSH_MIRROR|TRANSPORT_PUSH_FORCE);
137 if ((flags & TRANSPORT_PUSH_ALL) && refspec) {
138 if (!strcmp(*refspec, "refs/tags/*"))
139 return error("--all and --tags are incompatible");
140 return error("--all can't be combined with refspecs");
143 if ((flags & TRANSPORT_PUSH_MIRROR) && refspec) {
144 if (!strcmp(*refspec, "refs/tags/*"))
145 return error("--mirror and --tags are incompatible");
146 return error("--mirror can't be combined with refspecs");
149 if ((flags & (TRANSPORT_PUSH_ALL|TRANSPORT_PUSH_MIRROR)) ==
150 (TRANSPORT_PUSH_ALL|TRANSPORT_PUSH_MIRROR)) {
151 return error("--all and --mirror are incompatible");
154 if (!refspec && !(flags & TRANSPORT_PUSH_ALL)) {
155 if (remote->push_refspec_nr) {
156 refspec = remote->push_refspec;
157 refspec_nr = remote->push_refspec_nr;
158 } else if (!(flags & TRANSPORT_PUSH_MIRROR))
159 setup_default_push_refspecs();
161 errs = 0;
162 if (remote->pushurl_nr) {
163 url = remote->pushurl;
164 url_nr = remote->pushurl_nr;
165 } else {
166 url = remote->url;
167 url_nr = remote->url_nr;
169 if (url_nr) {
170 for (i = 0; i < url_nr; i++) {
171 struct transport *transport =
172 transport_get(remote, url[i]);
173 if (push_with_options(transport, flags))
174 errs++;
176 } else {
177 struct transport *transport =
178 transport_get(remote, NULL);
180 if (push_with_options(transport, flags))
181 errs++;
183 return !!errs;
186 int cmd_push(int argc, const char **argv, const char *prefix)
188 int flags = 0;
189 int tags = 0;
190 int rc;
191 const char *repo = NULL; /* default repository */
192 struct option options[] = {
193 OPT_BIT('q', "quiet", &flags, "be quiet", TRANSPORT_PUSH_QUIET),
194 OPT_BIT('v', "verbose", &flags, "be verbose", TRANSPORT_PUSH_VERBOSE),
195 OPT_STRING( 0 , "repo", &repo, "repository", "repository"),
196 OPT_BIT( 0 , "all", &flags, "push all refs", TRANSPORT_PUSH_ALL),
197 OPT_BIT( 0 , "mirror", &flags, "mirror all refs",
198 (TRANSPORT_PUSH_MIRROR|TRANSPORT_PUSH_FORCE)),
199 OPT_BOOLEAN( 0 , "tags", &tags, "push tags (can't be used with --all or --mirror)"),
200 OPT_BIT('n' , "dry-run", &flags, "dry run", TRANSPORT_PUSH_DRY_RUN),
201 OPT_BIT( 0, "porcelain", &flags, "machine-readable output", TRANSPORT_PUSH_PORCELAIN),
202 OPT_BIT('f', "force", &flags, "force updates", TRANSPORT_PUSH_FORCE),
203 OPT_BOOLEAN( 0 , "thin", &thin, "use thin pack"),
204 OPT_STRING( 0 , "receive-pack", &receivepack, "receive-pack", "receive pack program"),
205 OPT_STRING( 0 , "exec", &receivepack, "receive-pack", "receive pack program"),
206 OPT_END()
209 git_config(git_default_config, NULL);
210 argc = parse_options(argc, argv, prefix, options, push_usage, 0);
212 if (tags)
213 add_refspec("refs/tags/*");
215 if (argc > 0) {
216 repo = argv[0];
217 set_refspecs(argv + 1, argc - 1);
220 rc = do_push(repo, flags);
221 if (rc == -1)
222 usage_with_options(push_usage, options);
223 else
224 return rc;