6 #include "run-command.h"
10 static const char send_pack_usage
[] =
11 "git-send-pack [--all | --mirror] [--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"))
75 if (finish_command(&po
))
76 return error("pack-objects died with strange error");
80 static void unmark_and_free(struct commit_list
*list
, unsigned int mark
)
83 struct commit_list
*temp
= list
;
84 temp
->item
->object
.flags
&= ~mark
;
90 static int ref_newer(const unsigned char *new_sha1
,
91 const unsigned char *old_sha1
)
94 struct commit
*old
, *new;
95 struct commit_list
*list
, *used
;
98 /* Both new and old must be commit-ish and new is descendant of
99 * old. Otherwise we require --force.
101 o
= deref_tag(parse_object(old_sha1
), NULL
, 0);
102 if (!o
|| o
->type
!= OBJ_COMMIT
)
104 old
= (struct commit
*) o
;
106 o
= deref_tag(parse_object(new_sha1
), NULL
, 0);
107 if (!o
|| o
->type
!= OBJ_COMMIT
)
109 new = (struct commit
*) o
;
111 if (parse_commit(new) < 0)
115 commit_list_insert(new, &list
);
117 new = pop_most_recent_commit(&list
, 1);
118 commit_list_insert(new, &used
);
124 unmark_and_free(list
, 1);
125 unmark_and_free(used
, 1);
129 static struct ref
*local_refs
, **local_tail
;
130 static struct ref
*remote_refs
, **remote_tail
;
132 static int one_local_ref(const char *refname
, const unsigned char *sha1
, int flag
, void *cb_data
)
135 int len
= strlen(refname
) + 1;
136 ref
= xcalloc(1, sizeof(*ref
) + len
);
137 hashcpy(ref
->new_sha1
, sha1
);
138 memcpy(ref
->name
, refname
, len
);
140 local_tail
= &ref
->next
;
144 static void get_local_heads(void)
146 local_tail
= &local_refs
;
147 for_each_ref(one_local_ref
, NULL
);
150 static int receive_status(int in
, struct ref
*refs
)
155 int len
= packet_read_line(in
, line
, sizeof(line
));
156 if (len
< 10 || memcmp(line
, "unpack ", 7))
157 return error("did not receive remote status");
158 if (memcmp(line
, "unpack ok\n", 10)) {
159 char *p
= line
+ strlen(line
) - 1;
162 error("unpack failed: %s", line
+ 7);
169 len
= packet_read_line(in
, line
, sizeof(line
));
173 (memcmp(line
, "ok ", 3) && memcmp(line
, "ng ", 3))) {
174 fprintf(stderr
, "protocol error: %s\n", line
);
179 line
[strlen(line
)-1] = '\0';
181 msg
= strchr(refname
, ' ');
185 /* first try searching at our hint, falling back to all refs */
187 hint
= find_ref_by_name(hint
, refname
);
189 hint
= find_ref_by_name(refs
, refname
);
191 warning("remote reported status on unknown ref: %s",
195 if (hint
->status
!= REF_STATUS_EXPECTING_REPORT
) {
196 warning("remote reported status on unexpected ref: %s",
201 if (line
[0] == 'o' && line
[1] == 'k')
202 hint
->status
= REF_STATUS_OK
;
204 hint
->status
= REF_STATUS_REMOTE_REJECT
;
208 hint
->remote_status
= xstrdup(msg
);
209 /* start our next search from the next ref */
215 static void update_tracking_ref(struct remote
*remote
, struct ref
*ref
)
219 if (ref
->status
!= REF_STATUS_OK
)
225 if (!remote_find_tracking(remote
, &rs
)) {
227 fprintf(stderr
, "updating local tracking ref '%s'\n", rs
.dst
);
229 if (delete_ref(rs
.dst
, NULL
))
230 error("Failed to delete");
232 update_ref("update by push", rs
.dst
,
233 ref
->new_sha1
, NULL
, 0, 0);
238 static const char *prettify_ref(const struct ref
*ref
)
240 const char *name
= ref
->name
;
242 !prefixcmp(name
, "refs/heads/") ? 11 :
243 !prefixcmp(name
, "refs/tags/") ? 10 :
244 !prefixcmp(name
, "refs/remotes/") ? 13 :
248 #define SUMMARY_WIDTH (2 * DEFAULT_ABBREV + 3)
250 static void print_ref_status(char flag
, const char *summary
, struct ref
*to
, struct ref
*from
, const char *msg
)
252 fprintf(stderr
, " %c %-*s ", flag
, SUMMARY_WIDTH
, summary
);
254 fprintf(stderr
, "%s -> %s", prettify_ref(from
), prettify_ref(to
));
256 fputs(prettify_ref(to
), stderr
);
265 static const char *status_abbrev(unsigned char sha1
[20])
268 abbrev
= find_unique_abbrev(sha1
, DEFAULT_ABBREV
);
269 return abbrev
? abbrev
: sha1_to_hex(sha1
);
272 static void print_ok_ref_status(struct ref
*ref
)
275 print_ref_status('-', "[deleted]", ref
, NULL
, NULL
);
276 else if (is_null_sha1(ref
->old_sha1
))
277 print_ref_status('*',
278 (!prefixcmp(ref
->name
, "refs/tags/") ? "[new tag]" :
280 ref
, ref
->peer_ref
, NULL
);
286 strcpy(quickref
, status_abbrev(ref
->old_sha1
));
287 if (ref
->nonfastforward
) {
288 strcat(quickref
, "...");
290 msg
= "forced update";
292 strcat(quickref
, "..");
296 strcat(quickref
, status_abbrev(ref
->new_sha1
));
298 print_ref_status(type
, quickref
, ref
, ref
->peer_ref
, msg
);
302 static int print_one_push_status(struct ref
*ref
, const char *dest
, int count
)
305 fprintf(stderr
, "To %s\n", dest
);
307 switch(ref
->status
) {
308 case REF_STATUS_NONE
:
309 print_ref_status('X', "[no match]", ref
, NULL
, NULL
);
311 case REF_STATUS_REJECT_NODELETE
:
312 print_ref_status('!', "[rejected]", ref
, NULL
,
313 "remote does not support deleting refs");
315 case REF_STATUS_UPTODATE
:
316 print_ref_status('=', "[up to date]", ref
,
317 ref
->peer_ref
, NULL
);
319 case REF_STATUS_REJECT_NONFASTFORWARD
:
320 print_ref_status('!', "[rejected]", ref
, ref
->peer_ref
,
323 case REF_STATUS_REMOTE_REJECT
:
324 print_ref_status('!', "[remote rejected]", ref
,
325 ref
->deletion
? NULL
: ref
->peer_ref
,
328 case REF_STATUS_EXPECTING_REPORT
:
329 print_ref_status('!', "[remote failure]", ref
,
330 ref
->deletion
? NULL
: ref
->peer_ref
,
331 "remote failed to report status");
334 print_ok_ref_status(ref
);
341 static void print_push_status(const char *dest
, struct ref
*refs
)
347 for (ref
= refs
; ref
; ref
= ref
->next
)
348 if (ref
->status
== REF_STATUS_UPTODATE
)
349 n
+= print_one_push_status(ref
, dest
, n
);
352 for (ref
= refs
; ref
; ref
= ref
->next
)
353 if (ref
->status
== REF_STATUS_OK
)
354 n
+= print_one_push_status(ref
, dest
, n
);
356 for (ref
= refs
; ref
; ref
= ref
->next
) {
357 if (ref
->status
!= REF_STATUS_NONE
&&
358 ref
->status
!= REF_STATUS_UPTODATE
&&
359 ref
->status
!= REF_STATUS_OK
)
360 n
+= print_one_push_status(ref
, dest
, n
);
364 static int refs_pushed(struct ref
*ref
)
366 for (; ref
; ref
= ref
->next
) {
367 switch(ref
->status
) {
368 case REF_STATUS_NONE
:
369 case REF_STATUS_UPTODATE
:
378 static int do_send_pack(int in
, int out
, struct remote
*remote
, const char *dest
, int nr_refspec
, const char **refspec
)
382 int ask_for_status_report
= 0;
383 int allow_deleting_refs
= 0;
384 int expect_status_report
= 0;
385 int flags
= MATCH_REFS_NONE
;
389 flags
|= MATCH_REFS_ALL
;
390 if (args
.send_mirror
)
391 flags
|= MATCH_REFS_MIRROR
;
393 /* No funny business with the matcher */
394 remote_tail
= get_remote_heads(in
, &remote_refs
, 0, NULL
, REF_NORMAL
);
397 /* Does the other end support the reporting? */
398 if (server_supports("report-status"))
399 ask_for_status_report
= 1;
400 if (server_supports("delete-refs"))
401 allow_deleting_refs
= 1;
405 remote_tail
= &remote_refs
;
406 if (match_refs(local_refs
, remote_refs
, &remote_tail
,
407 nr_refspec
, refspec
, flags
)) {
413 fprintf(stderr
, "No refs in common and none specified; doing nothing.\n"
414 "Perhaps you should specify a branch such as 'master'.\n");
420 * Finally, tell the other end!
423 for (ref
= remote_refs
; ref
; ref
= ref
->next
) {
424 const unsigned char *new_sha1
;
426 if (!ref
->peer_ref
) {
427 if (!args
.send_mirror
)
429 new_sha1
= null_sha1
;
432 new_sha1
= ref
->peer_ref
->new_sha1
;
435 ref
->deletion
= is_null_sha1(new_sha1
);
436 if (ref
->deletion
&& !allow_deleting_refs
) {
437 ref
->status
= REF_STATUS_REJECT_NODELETE
;
440 if (!ref
->deletion
&&
441 !hashcmp(ref
->old_sha1
, new_sha1
)) {
442 ref
->status
= REF_STATUS_UPTODATE
;
446 /* This part determines what can overwrite what.
449 * (0) you can always use --force or +A:B notation to
450 * selectively force individual ref pairs.
452 * (1) if the old thing does not exist, it is OK.
454 * (2) if you do not have the old thing, you are not allowed
455 * to overwrite it; you would not know what you are losing
458 * (3) if both new and old are commit-ish, and new is a
459 * descendant of old, it is OK.
461 * (4) regardless of all of the above, removing :B is
465 ref
->nonfastforward
=
467 !is_null_sha1(ref
->old_sha1
) &&
468 (!has_sha1_file(ref
->old_sha1
)
469 || !ref_newer(new_sha1
, ref
->old_sha1
));
471 if (ref
->nonfastforward
&& !ref
->force
&& !args
.force_update
) {
472 ref
->status
= REF_STATUS_REJECT_NONFASTFORWARD
;
476 hashcpy(ref
->new_sha1
, new_sha1
);
481 char *old_hex
= sha1_to_hex(ref
->old_sha1
);
482 char *new_hex
= sha1_to_hex(ref
->new_sha1
);
484 if (ask_for_status_report
) {
485 packet_write(out
, "%s %s %s%c%s",
486 old_hex
, new_hex
, ref
->name
, 0,
488 ask_for_status_report
= 0;
489 expect_status_report
= 1;
492 packet_write(out
, "%s %s %s",
493 old_hex
, new_hex
, ref
->name
);
495 ref
->status
= expect_status_report
?
496 REF_STATUS_EXPECTING_REPORT
:
501 if (new_refs
&& !args
.dry_run
) {
502 if (pack_objects(out
, remote_refs
) < 0)
508 if (expect_status_report
)
509 ret
= receive_status(in
, remote_refs
);
513 print_push_status(dest
, remote_refs
);
515 if (!args
.dry_run
&& remote
) {
516 for (ref
= remote_refs
; ref
; ref
= ref
->next
)
517 update_tracking_ref(remote
, ref
);
520 if (!refs_pushed(remote_refs
))
521 fprintf(stderr
, "Everything up-to-date\n");
524 for (ref
= remote_refs
; ref
; ref
= ref
->next
) {
525 switch (ref
->status
) {
526 case REF_STATUS_NONE
:
527 case REF_STATUS_UPTODATE
:
537 static void verify_remote_names(int nr_heads
, const char **heads
)
541 for (i
= 0; i
< nr_heads
; i
++) {
542 const char *remote
= strchr(heads
[i
], ':');
544 remote
= remote
? (remote
+ 1) : heads
[i
];
545 switch (check_ref_format(remote
)) {
547 case CHECK_REF_FORMAT_ONELEVEL
:
548 /* ok but a single level -- that is fine for
551 case CHECK_REF_FORMAT_WILDCARD
:
552 /* ok but ends with a pattern-match character */
555 die("remote part of refspec is not a valid name in %s",
560 int cmd_send_pack(int argc
, const char **argv
, const char *prefix
)
563 const char **heads
= NULL
;
564 const char *remote_name
= NULL
;
565 struct remote
*remote
= NULL
;
566 const char *dest
= NULL
;
569 for (i
= 1; i
< argc
; i
++, argv
++) {
570 const char *arg
= *argv
;
573 if (!prefixcmp(arg
, "--receive-pack=")) {
574 args
.receivepack
= arg
+ 15;
577 if (!prefixcmp(arg
, "--exec=")) {
578 args
.receivepack
= arg
+ 7;
581 if (!prefixcmp(arg
, "--remote=")) {
582 remote_name
= arg
+ 9;
585 if (!strcmp(arg
, "--all")) {
589 if (!strcmp(arg
, "--dry-run")) {
593 if (!strcmp(arg
, "--mirror")) {
594 args
.send_mirror
= 1;
597 if (!strcmp(arg
, "--force")) {
598 args
.force_update
= 1;
601 if (!strcmp(arg
, "--verbose")) {
605 if (!strcmp(arg
, "--thin")) {
606 args
.use_thin_pack
= 1;
609 usage(send_pack_usage
);
615 heads
= (const char **) argv
;
620 usage(send_pack_usage
);
622 * --all and --mirror are incompatible; neither makes sense
625 if ((heads
&& (args
.send_all
|| args
.send_mirror
)) ||
626 (args
.send_all
&& args
.send_mirror
))
627 usage(send_pack_usage
);
630 remote
= remote_get(remote_name
);
631 if (!remote_has_url(remote
, dest
)) {
632 die("Destination %s is not a uri for %s",
637 return send_pack(&args
, dest
, remote
, nr_heads
, heads
);
640 int send_pack(struct send_pack_args
*my_args
,
641 const char *dest
, struct remote
*remote
,
642 int nr_heads
, const char **heads
)
645 struct child_process
*conn
;
647 memcpy(&args
, my_args
, sizeof(args
));
649 verify_remote_names(nr_heads
, heads
);
651 conn
= git_connect(fd
, dest
, args
.receivepack
, args
.verbose
? CONNECT_VERBOSE
: 0);
652 ret
= do_send_pack(fd
[0], fd
[1], remote
, dest
, nr_heads
, heads
);
654 /* do_send_pack always closes fd[1] */
655 ret
|= finish_connect(conn
);