merge-recursive: mark rename/delete conflict as unmerged
[git] / builtin-push.c
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
12 static const char * const push_usage[] = {
13         "git push [--all | --mirror] [--dry-run] [--tags] [--receive-pack=<git-receive-pack>] [--repo=<repository>] [-f | --force] [-v] [<repository> <refspec>...]",
14         NULL,
15 };
16
17 static int thin;
18 static const char *receivepack;
19
20 static const char **refspec;
21 static int refspec_nr;
22
23 static 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
31 static 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
51 static int do_push(const char *repo, int flags)
52 {
53         int i, errs;
54         struct remote *remote = remote_get(repo);
55
56         if (!remote)
57                 die("bad repository '%s'", repo);
58
59         if (remote->mirror)
60                 flags |= (TRANSPORT_PUSH_MIRROR|TRANSPORT_PUSH_FORCE);
61
62         if ((flags & TRANSPORT_PUSH_ALL) && refspec) {
63                 if (!strcmp(*refspec, "refs/tags/*"))
64                         return error("--all and --tags are incompatible");
65                 return error("--all can't be combined with refspecs");
66         }
67
68         if ((flags & TRANSPORT_PUSH_MIRROR) && refspec) {
69                 if (!strcmp(*refspec, "refs/tags/*"))
70                         return error("--mirror and --tags are incompatible");
71                 return error("--mirror can't be combined with refspecs");
72         }
73
74         if ((flags & (TRANSPORT_PUSH_ALL|TRANSPORT_PUSH_MIRROR)) ==
75                                 (TRANSPORT_PUSH_ALL|TRANSPORT_PUSH_MIRROR)) {
76                 return error("--all and --mirror are incompatible");
77         }
78
79         if (!refspec
80                 && !(flags & TRANSPORT_PUSH_ALL)
81                 && remote->push_refspec_nr) {
82                 refspec = remote->push_refspec;
83                 refspec_nr = remote->push_refspec_nr;
84         }
85         errs = 0;
86         for (i = 0; i < remote->url_nr; i++) {
87                 struct transport *transport =
88                         transport_get(remote, remote->url[i]);
89                 int err;
90                 if (receivepack)
91                         transport_set_option(transport,
92                                              TRANS_OPT_RECEIVEPACK, receivepack);
93                 if (thin)
94                         transport_set_option(transport, TRANS_OPT_THIN, "yes");
95
96                 if (flags & TRANSPORT_PUSH_VERBOSE)
97                         fprintf(stderr, "Pushing to %s\n", remote->url[i]);
98                 err = transport_push(transport, refspec_nr, refspec, flags);
99                 err |= transport_disconnect(transport);
100
101                 if (!err)
102                         continue;
103
104                 error("failed to push some refs to '%s'", remote->url[i]);
105                 errs++;
106         }
107         return !!errs;
108 }
109
110 int cmd_push(int argc, const char **argv, const char *prefix)
111 {
112         int flags = 0;
113         int tags = 0;
114         int rc;
115         const char *repo = NULL;        /* default repository */
116
117         struct option options[] = {
118                 OPT_BIT('v', "verbose", &flags, "be verbose", TRANSPORT_PUSH_VERBOSE),
119                 OPT_STRING( 0 , "repo", &repo, "repository", "repository"),
120                 OPT_BIT( 0 , "all", &flags, "push all refs", TRANSPORT_PUSH_ALL),
121                 OPT_BIT( 0 , "mirror", &flags, "mirror all refs",
122                             (TRANSPORT_PUSH_MIRROR|TRANSPORT_PUSH_FORCE)),
123                 OPT_BOOLEAN( 0 , "tags", &tags, "push tags"),
124                 OPT_BIT( 0 , "dry-run", &flags, "dry run", TRANSPORT_PUSH_DRY_RUN),
125                 OPT_BIT('f', "force", &flags, "force updates", TRANSPORT_PUSH_FORCE),
126                 OPT_BOOLEAN( 0 , "thin", &thin, "use thin pack"),
127                 OPT_STRING( 0 , "receive-pack", &receivepack, "receive-pack", "receive pack program"),
128                 OPT_STRING( 0 , "exec", &receivepack, "receive-pack", "receive pack program"),
129                 OPT_END()
130         };
131
132         argc = parse_options(argc, argv, options, push_usage, 0);
133
134         if (tags)
135                 add_refspec("refs/tags/*");
136
137         if (argc > 0) {
138                 repo = argv[0];
139                 set_refspecs(argv + 1, argc - 1);
140         }
141
142         rc = do_push(repo, flags);
143         if (rc == -1)
144                 usage_with_options(push_usage, options);
145         else
146                 return rc;
147 }