6 #include "run-command.h"
10 static const char send_pack_usage[] =
11 "git-send-pack [--all] [--dry-run] [--force] [--receive-pack=<git-receive-pack>] [--verbose] [--thin] [<host>:]<directory> [<ref>...]\n"
12 " --all and explicit <ref> specification are mutually exclusive.";
14 static struct send_pack_args args = {
15 /* .receivepack = */ "git-receive-pack",
19 * Make a pack stream and spit it out into file descriptor fd
21 static int pack_objects(int fd, struct ref *refs)
24 * The child becomes pack-objects --revs; we feed
25 * the revision parameters to it via its stdin and
26 * let its stdout go back to the other end.
28 const char *argv[] = {
36 struct child_process po;
38 if (args.use_thin_pack)
40 memset(&po, 0, sizeof(po));
45 if (start_command(&po))
46 die("git-pack-objects failed (%s)", strerror(errno));
49 * We feed the pack-objects we just spawned with revision
50 * parameters by writing to the pipe.
55 if (!is_null_sha1(refs->old_sha1) &&
56 has_sha1_file(refs->old_sha1)) {
57 memcpy(buf + 1, sha1_to_hex(refs->old_sha1), 40);
60 if (!write_or_whine(po.in, buf, 42,
61 "send-pack: send refs"))
64 if (!is_null_sha1(refs->new_sha1)) {
65 memcpy(buf, sha1_to_hex(refs->new_sha1), 40);
67 if (!write_or_whine(po.in, buf, 41,
68 "send-pack: send refs"))
74 if (finish_command(&po))
75 return error("pack-objects died with strange error");
79 static void unmark_and_free(struct commit_list *list, unsigned int mark)
82 struct commit_list *temp = list;
83 temp->item->object.flags &= ~mark;
89 static int ref_newer(const unsigned char *new_sha1,
90 const unsigned char *old_sha1)
93 struct commit *old, *new;
94 struct commit_list *list, *used;
97 /* Both new and old must be commit-ish and new is descendant of
98 * old. Otherwise we require --force.
100 o = deref_tag(parse_object(old_sha1), NULL, 0);
101 if (!o || o->type != OBJ_COMMIT)
103 old = (struct commit *) o;
105 o = deref_tag(parse_object(new_sha1), NULL, 0);
106 if (!o || o->type != OBJ_COMMIT)
108 new = (struct commit *) o;
110 if (parse_commit(new) < 0)
114 commit_list_insert(new, &list);
116 new = pop_most_recent_commit(&list, 1);
117 commit_list_insert(new, &used);
123 unmark_and_free(list, 1);
124 unmark_and_free(used, 1);
128 static struct ref *local_refs, **local_tail;
129 static struct ref *remote_refs, **remote_tail;
131 static int one_local_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
134 int len = strlen(refname) + 1;
135 ref = xcalloc(1, sizeof(*ref) + len);
136 hashcpy(ref->new_sha1, sha1);
137 memcpy(ref->name, refname, len);
139 local_tail = &ref->next;
143 static void get_local_heads(void)
145 local_tail = &local_refs;
146 for_each_ref(one_local_ref, NULL);
149 static int receive_status(int in)
153 int len = packet_read_line(in, line, sizeof(line));
154 if (len < 10 || memcmp(line, "unpack ", 7)) {
155 fprintf(stderr, "did not receive status back\n");
158 if (memcmp(line, "unpack ok\n", 10)) {
163 len = packet_read_line(in, line, sizeof(line));
167 (memcmp(line, "ok", 2) && memcmp(line, "ng", 2))) {
168 fprintf(stderr, "protocol error: %s\n", line);
172 if (!memcmp(line, "ok", 2))
180 static void update_tracking_ref(struct remote *remote, struct ref *ref)
191 will_delete_ref = is_null_sha1(ref->peer_ref->new_sha1);
193 if (!will_delete_ref &&
194 !hashcmp(ref->old_sha1, ref->peer_ref->new_sha1))
197 if (!remote_find_tracking(remote, &rs)) {
198 fprintf(stderr, "updating local tracking ref '%s'\n", rs.dst);
199 if (is_null_sha1(ref->peer_ref->new_sha1)) {
200 if (delete_ref(rs.dst, NULL))
201 error("Failed to delete");
203 update_ref("update by push", rs.dst,
204 ref->new_sha1, NULL, 0, 0);
209 static int do_send_pack(int in, int out, struct remote *remote, int nr_refspec, const char **refspec)
214 int ask_for_status_report = 0;
215 int allow_deleting_refs = 0;
216 int expect_status_report = 0;
218 /* No funny business with the matcher */
219 remote_tail = get_remote_heads(in, &remote_refs, 0, NULL, REF_NORMAL);
222 /* Does the other end support the reporting? */
223 if (server_supports("report-status"))
224 ask_for_status_report = 1;
225 if (server_supports("delete-refs"))
226 allow_deleting_refs = 1;
230 remote_tail = &remote_refs;
231 if (match_refs(local_refs, remote_refs, &remote_tail,
232 nr_refspec, refspec, args.send_all))
236 fprintf(stderr, "No refs in common and none specified; doing nothing.\n"
237 "Perhaps you should specify a branch such as 'master'.\n");
242 * Finally, tell the other end!
245 for (ref = remote_refs; ref; ref = ref->next) {
246 char old_hex[60], *new_hex;
253 will_delete_ref = is_null_sha1(ref->peer_ref->new_sha1);
254 if (will_delete_ref && !allow_deleting_refs) {
255 error("remote does not support deleting refs");
259 if (!will_delete_ref &&
260 !hashcmp(ref->old_sha1, ref->peer_ref->new_sha1)) {
262 fprintf(stderr, "'%s': up-to-date\n", ref->name);
266 /* This part determines what can overwrite what.
269 * (0) you can always use --force or +A:B notation to
270 * selectively force individual ref pairs.
272 * (1) if the old thing does not exist, it is OK.
274 * (2) if you do not have the old thing, you are not allowed
275 * to overwrite it; you would not know what you are losing
278 * (3) if both new and old are commit-ish, and new is a
279 * descendant of old, it is OK.
281 * (4) regardless of all of the above, removing :B is
285 if (!args.force_update &&
287 !is_null_sha1(ref->old_sha1) &&
289 if (!has_sha1_file(ref->old_sha1) ||
290 !ref_newer(ref->peer_ref->new_sha1,
292 /* We do not have the remote ref, or
293 * we know that the remote ref is not
294 * an ancestor of what we are trying to
295 * push. Either way this can be losing
296 * commits at the remote end and likely
297 * we were not up to date to begin with.
299 error("remote '%s' is not a strict "
300 "subset of local ref '%s'. "
301 "maybe you are not up-to-date and "
302 "need to pull first?",
304 ref->peer_ref->name);
309 hashcpy(ref->new_sha1, ref->peer_ref->new_sha1);
310 if (!will_delete_ref)
312 strcpy(old_hex, sha1_to_hex(ref->old_sha1));
313 new_hex = sha1_to_hex(ref->new_sha1);
316 if (ask_for_status_report) {
317 packet_write(out, "%s %s %s%c%s",
318 old_hex, new_hex, ref->name, 0,
320 ask_for_status_report = 0;
321 expect_status_report = 1;
324 packet_write(out, "%s %s %s",
325 old_hex, new_hex, ref->name);
328 fprintf(stderr, "deleting '%s'\n", ref->name);
330 fprintf(stderr, "updating '%s'", ref->name);
331 if (strcmp(ref->name, ref->peer_ref->name))
332 fprintf(stderr, " using '%s'",
333 ref->peer_ref->name);
334 fprintf(stderr, "\n from %s\n to %s\n",
340 if (new_refs && !args.dry_run)
341 ret = pack_objects(out, remote_refs);
344 if (expect_status_report) {
345 if (receive_status(in))
349 if (!args.dry_run && remote && ret == 0) {
350 for (ref = remote_refs; ref; ref = ref->next)
351 update_tracking_ref(remote, ref);
354 if (!new_refs && ret == 0)
355 fprintf(stderr, "Everything up-to-date\n");
359 static void verify_remote_names(int nr_heads, const char **heads)
363 for (i = 0; i < nr_heads; i++) {
364 const char *remote = strchr(heads[i], ':');
366 remote = remote ? (remote + 1) : heads[i];
367 switch (check_ref_format(remote)) {
369 case -2: /* ok but a single level -- that is fine for
372 case -3: /* ok but ends with a pattern-match character */
375 die("remote part of refspec is not a valid name in %s",
380 int cmd_send_pack(int argc, const char **argv, const char *prefix)
383 const char **heads = NULL;
384 const char *remote_name = NULL;
385 struct remote *remote = NULL;
386 const char *dest = NULL;
389 for (i = 1; i < argc; i++, argv++) {
390 const char *arg = *argv;
393 if (!prefixcmp(arg, "--receive-pack=")) {
394 args.receivepack = arg + 15;
397 if (!prefixcmp(arg, "--exec=")) {
398 args.receivepack = arg + 7;
401 if (!prefixcmp(arg, "--remote=")) {
402 remote_name = arg + 9;
405 if (!strcmp(arg, "--all")) {
409 if (!strcmp(arg, "--dry-run")) {
413 if (!strcmp(arg, "--force")) {
414 args.force_update = 1;
417 if (!strcmp(arg, "--verbose")) {
421 if (!strcmp(arg, "--thin")) {
422 args.use_thin_pack = 1;
425 usage(send_pack_usage);
431 heads = (const char **) argv;
436 usage(send_pack_usage);
437 if (heads && args.send_all)
438 usage(send_pack_usage);
441 remote = remote_get(remote_name);
442 if (!remote_has_url(remote, dest)) {
443 die("Destination %s is not a uri for %s",
448 return send_pack(&args, dest, remote, nr_heads, heads);
451 int send_pack(struct send_pack_args *my_args,
452 const char *dest, struct remote *remote,
453 int nr_heads, const char **heads)
456 struct child_process *conn;
458 memcpy(&args, my_args, sizeof(args));
460 verify_remote_names(nr_heads, heads);
462 conn = git_connect(fd, dest, args.receivepack, args.verbose ? CONNECT_VERBOSE : 0);
463 ret = do_send_pack(fd[0], fd[1], remote, nr_heads, heads);
466 ret |= finish_connect(conn);