9 #include "fetch-pack.h"
11 #include "run-command.h"
13 #include "transport.h"
15 #include "prio-queue.h"
16 #include "sha1-array.h"
18 static int transfer_unpack_limit
= -1;
19 static int fetch_unpack_limit
= -1;
20 static int unpack_limit
= 100;
21 static int prefer_ofs_delta
= 1;
23 static int fetch_fsck_objects
= -1;
24 static int transfer_fsck_objects
= -1;
25 static int agent_supported
;
26 static struct lock_file shallow_lock
;
27 static const char *alternate_shallow_file
;
29 #define COMPLETE (1U << 0)
30 #define COMMON (1U << 1)
31 #define COMMON_REF (1U << 2)
32 #define SEEN (1U << 3)
33 #define POPPED (1U << 4)
38 * After sending this many "have"s if we do not get any new ACK , we
39 * give up traversing our history.
41 #define MAX_IN_VAIN 256
43 static struct prio_queue rev_list
= { compare_commits_by_commit_date
};
44 static int non_common_revs
, multi_ack
, use_sideband
, allow_tip_sha1_in_want
;
46 static void rev_list_push(struct commit
*commit
, int mark
)
48 if (!(commit
->object
.flags
& mark
)) {
49 commit
->object
.flags
|= mark
;
51 if (parse_commit(commit
))
54 prio_queue_put(&rev_list
, commit
);
56 if (!(commit
->object
.flags
& COMMON
))
61 static int rev_list_insert_ref(const char *refname
, const unsigned char *sha1
, int flag
, void *cb_data
)
63 struct object
*o
= deref_tag(parse_object(sha1
), refname
, 0);
65 if (o
&& o
->type
== OBJ_COMMIT
)
66 rev_list_push((struct commit
*)o
, SEEN
);
71 static int clear_marks(const char *refname
, const unsigned char *sha1
, int flag
, void *cb_data
)
73 struct object
*o
= deref_tag(parse_object(sha1
), refname
, 0);
75 if (o
&& o
->type
== OBJ_COMMIT
)
76 clear_commit_marks((struct commit
*)o
,
77 COMMON
| COMMON_REF
| SEEN
| POPPED
);
82 This function marks a rev and its ancestors as common.
83 In some cases, it is desirable to mark only the ancestors (for example
84 when only the server does not yet know that they are common).
87 static void mark_common(struct commit
*commit
,
88 int ancestors_only
, int dont_parse
)
90 if (commit
!= NULL
&& !(commit
->object
.flags
& COMMON
)) {
91 struct object
*o
= (struct object
*)commit
;
96 if (!(o
->flags
& SEEN
))
97 rev_list_push(commit
, SEEN
);
99 struct commit_list
*parents
;
101 if (!ancestors_only
&& !(o
->flags
& POPPED
))
103 if (!o
->parsed
&& !dont_parse
)
104 if (parse_commit(commit
))
107 for (parents
= commit
->parents
;
109 parents
= parents
->next
)
110 mark_common(parents
->item
, 0, dont_parse
);
116 Get the next rev to send, ignoring the common.
119 static const unsigned char *get_rev(void)
121 struct commit
*commit
= NULL
;
123 while (commit
== NULL
) {
125 struct commit_list
*parents
;
127 if (rev_list
.nr
== 0 || non_common_revs
== 0)
130 commit
= prio_queue_get(&rev_list
);
131 parse_commit(commit
);
132 parents
= commit
->parents
;
134 commit
->object
.flags
|= POPPED
;
135 if (!(commit
->object
.flags
& COMMON
))
138 if (commit
->object
.flags
& COMMON
) {
139 /* do not send "have", and ignore ancestors */
141 mark
= COMMON
| SEEN
;
142 } else if (commit
->object
.flags
& COMMON_REF
)
143 /* send "have", and ignore ancestors */
144 mark
= COMMON
| SEEN
;
146 /* send "have", also for its ancestors */
150 if (!(parents
->item
->object
.flags
& SEEN
))
151 rev_list_push(parents
->item
, mark
);
153 mark_common(parents
->item
, 1, 0);
154 parents
= parents
->next
;
158 return commit
->object
.sha1
;
169 static void consume_shallow_list(struct fetch_pack_args
*args
, int fd
)
171 if (args
->stateless_rpc
&& args
->depth
> 0) {
172 /* If we sent a depth we will get back "duplicate"
173 * shallow and unshallow commands every time there
174 * is a block of have lines exchanged.
177 while ((line
= packet_read_line(fd
, NULL
))) {
178 if (starts_with(line
, "shallow "))
180 if (starts_with(line
, "unshallow "))
182 die("git fetch-pack: expected shallow list");
187 static enum ack_type
get_ack(int fd
, unsigned char *result_sha1
)
190 char *line
= packet_read_line(fd
, &len
);
193 die("git fetch-pack: expected ACK/NAK, got EOF");
194 if (!strcmp(line
, "NAK"))
196 if (starts_with(line
, "ACK ")) {
197 if (!get_sha1_hex(line
+4, result_sha1
)) {
200 if (strstr(line
+45, "continue"))
202 if (strstr(line
+45, "common"))
204 if (strstr(line
+45, "ready"))
209 die("git fetch_pack: expected ACK/NAK, got '%s'", line
);
212 static void send_request(struct fetch_pack_args
*args
,
213 int fd
, struct strbuf
*buf
)
215 if (args
->stateless_rpc
) {
216 send_sideband(fd
, -1, buf
->buf
, buf
->len
, LARGE_PACKET_MAX
);
219 write_or_die(fd
, buf
->buf
, buf
->len
);
222 static void insert_one_alternate_ref(const struct ref
*ref
, void *unused
)
224 rev_list_insert_ref(NULL
, ref
->old_sha1
, 0, NULL
);
227 #define INITIAL_FLUSH 16
228 #define PIPESAFE_FLUSH 32
229 #define LARGE_FLUSH 1024
231 static int next_flush(struct fetch_pack_args
*args
, int count
)
233 int flush_limit
= args
->stateless_rpc
? LARGE_FLUSH
: PIPESAFE_FLUSH
;
235 if (count
< flush_limit
)
238 count
+= flush_limit
;
242 static int find_common(struct fetch_pack_args
*args
,
243 int fd
[2], unsigned char *result_sha1
,
247 int count
= 0, flushes
= 0, flush_at
= INITIAL_FLUSH
, retval
;
248 const unsigned char *sha1
;
249 unsigned in_vain
= 0;
250 int got_continue
= 0;
252 struct strbuf req_buf
= STRBUF_INIT
;
253 size_t state_len
= 0;
255 if (args
->stateless_rpc
&& multi_ack
== 1)
256 die("--stateless-rpc requires multi_ack_detailed");
258 for_each_ref(clear_marks
, NULL
);
261 for_each_ref(rev_list_insert_ref
, NULL
);
262 for_each_alternate_ref(insert_one_alternate_ref
, NULL
);
265 for ( ; refs
; refs
= refs
->next
) {
266 unsigned char *remote
= refs
->old_sha1
;
267 const char *remote_hex
;
271 * If that object is complete (i.e. it is an ancestor of a
272 * local ref), we tell them we have it but do not have to
273 * tell them about its ancestors, which they already know
276 * We use lookup_object here because we are only
277 * interested in the case we *know* the object is
278 * reachable and we have already scanned it.
280 if (((o
= lookup_object(remote
)) != NULL
) &&
281 (o
->flags
& COMPLETE
)) {
285 remote_hex
= sha1_to_hex(remote
);
287 struct strbuf c
= STRBUF_INIT
;
288 if (multi_ack
== 2) strbuf_addstr(&c
, " multi_ack_detailed");
289 if (multi_ack
== 1) strbuf_addstr(&c
, " multi_ack");
290 if (no_done
) strbuf_addstr(&c
, " no-done");
291 if (use_sideband
== 2) strbuf_addstr(&c
, " side-band-64k");
292 if (use_sideband
== 1) strbuf_addstr(&c
, " side-band");
293 if (args
->use_thin_pack
) strbuf_addstr(&c
, " thin-pack");
294 if (args
->no_progress
) strbuf_addstr(&c
, " no-progress");
295 if (args
->include_tag
) strbuf_addstr(&c
, " include-tag");
296 if (prefer_ofs_delta
) strbuf_addstr(&c
, " ofs-delta");
297 if (agent_supported
) strbuf_addf(&c
, " agent=%s",
298 git_user_agent_sanitized());
299 packet_buf_write(&req_buf
, "want %s%s\n", remote_hex
, c
.buf
);
302 packet_buf_write(&req_buf
, "want %s\n", remote_hex
);
307 strbuf_release(&req_buf
);
312 if (is_repository_shallow())
313 write_shallow_commits(&req_buf
, 1, NULL
);
315 packet_buf_write(&req_buf
, "deepen %d", args
->depth
);
316 packet_buf_flush(&req_buf
);
317 state_len
= req_buf
.len
;
319 if (args
->depth
> 0) {
321 unsigned char sha1
[20];
323 send_request(args
, fd
[1], &req_buf
);
324 while ((line
= packet_read_line(fd
[0], NULL
))) {
325 if (starts_with(line
, "shallow ")) {
326 if (get_sha1_hex(line
+ 8, sha1
))
327 die("invalid shallow line: %s", line
);
328 register_shallow(sha1
);
331 if (starts_with(line
, "unshallow ")) {
332 if (get_sha1_hex(line
+ 10, sha1
))
333 die("invalid unshallow line: %s", line
);
334 if (!lookup_object(sha1
))
335 die("object not found: %s", line
);
336 /* make sure that it is parsed as shallow */
337 if (!parse_object(sha1
))
338 die("error in object: %s", line
);
339 if (unregister_shallow(sha1
))
340 die("no shallow found: %s", line
);
343 die("expected shallow/unshallow, got %s", line
);
345 } else if (!args
->stateless_rpc
)
346 send_request(args
, fd
[1], &req_buf
);
348 if (!args
->stateless_rpc
) {
349 /* If we aren't using the stateless-rpc interface
350 * we don't need to retain the headers.
352 strbuf_setlen(&req_buf
, 0);
358 while ((sha1
= get_rev())) {
359 packet_buf_write(&req_buf
, "have %s\n", sha1_to_hex(sha1
));
361 fprintf(stderr
, "have %s\n", sha1_to_hex(sha1
));
363 if (flush_at
<= ++count
) {
366 packet_buf_flush(&req_buf
);
367 send_request(args
, fd
[1], &req_buf
);
368 strbuf_setlen(&req_buf
, state_len
);
370 flush_at
= next_flush(args
, count
);
373 * We keep one window "ahead" of the other side, and
374 * will wait for an ACK only on the next one
376 if (!args
->stateless_rpc
&& count
== INITIAL_FLUSH
)
379 consume_shallow_list(args
, fd
[0]);
381 ack
= get_ack(fd
[0], result_sha1
);
382 if (args
->verbose
&& ack
)
383 fprintf(stderr
, "got ack %d %s\n", ack
,
384 sha1_to_hex(result_sha1
));
394 struct commit
*commit
=
395 lookup_commit(result_sha1
);
397 die("invalid commit %s", sha1_to_hex(result_sha1
));
398 if (args
->stateless_rpc
400 && !(commit
->object
.flags
& COMMON
)) {
401 /* We need to replay the have for this object
402 * on the next RPC request so the peer knows
403 * it is in common with us.
405 const char *hex
= sha1_to_hex(result_sha1
);
406 packet_buf_write(&req_buf
, "have %s\n", hex
);
407 state_len
= req_buf
.len
;
409 mark_common(commit
, 0, 1);
413 if (ack
== ACK_ready
) {
414 clear_prio_queue(&rev_list
);
422 if (got_continue
&& MAX_IN_VAIN
< in_vain
) {
424 fprintf(stderr
, "giving up\n");
430 if (!got_ready
|| !no_done
) {
431 packet_buf_write(&req_buf
, "done\n");
432 send_request(args
, fd
[1], &req_buf
);
435 fprintf(stderr
, "done\n");
440 strbuf_release(&req_buf
);
442 if (!got_ready
|| !no_done
)
443 consume_shallow_list(args
, fd
[0]);
444 while (flushes
|| multi_ack
) {
445 int ack
= get_ack(fd
[0], result_sha1
);
448 fprintf(stderr
, "got ack (%d) %s\n", ack
,
449 sha1_to_hex(result_sha1
));
457 /* it is no error to fetch into a completely empty repo */
458 return count
? retval
: 0;
461 static struct commit_list
*complete
;
463 static int mark_complete(const char *refname
, const unsigned char *sha1
, int flag
, void *cb_data
)
465 struct object
*o
= parse_object(sha1
);
467 while (o
&& o
->type
== OBJ_TAG
) {
468 struct tag
*t
= (struct tag
*) o
;
470 break; /* broken repository */
471 o
->flags
|= COMPLETE
;
472 o
= parse_object(t
->tagged
->sha1
);
474 if (o
&& o
->type
== OBJ_COMMIT
) {
475 struct commit
*commit
= (struct commit
*)o
;
476 if (!(commit
->object
.flags
& COMPLETE
)) {
477 commit
->object
.flags
|= COMPLETE
;
478 commit_list_insert(commit
, &complete
);
484 static void mark_recent_complete_commits(struct fetch_pack_args
*args
,
485 unsigned long cutoff
)
487 while (complete
&& cutoff
<= complete
->item
->date
) {
489 fprintf(stderr
, "Marking %s as complete\n",
490 sha1_to_hex(complete
->item
->object
.sha1
));
491 pop_most_recent_commit(&complete
, COMPLETE
);
495 static void filter_refs(struct fetch_pack_args
*args
,
497 struct ref
**sought
, int nr_sought
)
499 struct ref
*newlist
= NULL
;
500 struct ref
**newtail
= &newlist
;
501 struct ref
*ref
, *next
;
505 for (ref
= *refs
; ref
; ref
= next
) {
509 if (!memcmp(ref
->name
, "refs/", 5) &&
510 check_refname_format(ref
->name
, 0))
513 while (i
< nr_sought
) {
514 int cmp
= strcmp(ref
->name
, sought
[i
]->name
);
516 break; /* definitely do not have it */
518 keep
= 1; /* definitely have it */
519 sought
[i
]->matched
= 1;
525 if (!keep
&& args
->fetch_all
&&
526 (!args
->depth
|| !starts_with(ref
->name
, "refs/tags/")))
532 newtail
= &ref
->next
;
538 /* Append unmatched requests to the list */
539 if (allow_tip_sha1_in_want
) {
540 for (i
= 0; i
< nr_sought
; i
++) {
544 if (get_sha1_hex(ref
->name
, ref
->old_sha1
))
550 newtail
= &ref
->next
;
556 static void mark_alternate_complete(const struct ref
*ref
, void *unused
)
558 mark_complete(NULL
, ref
->old_sha1
, 0, NULL
);
561 static int everything_local(struct fetch_pack_args
*args
,
563 struct ref
**sought
, int nr_sought
)
567 unsigned long cutoff
= 0;
569 save_commit_buffer
= 0;
571 for (ref
= *refs
; ref
; ref
= ref
->next
) {
574 if (!has_sha1_file(ref
->old_sha1
))
577 o
= parse_object(ref
->old_sha1
);
581 /* We already have it -- which may mean that we were
582 * in sync with the other side at some time after
583 * that (it is OK if we guess wrong here).
585 if (o
->type
== OBJ_COMMIT
) {
586 struct commit
*commit
= (struct commit
*)o
;
587 if (!cutoff
|| cutoff
< commit
->date
)
588 cutoff
= commit
->date
;
593 for_each_ref(mark_complete
, NULL
);
594 for_each_alternate_ref(mark_alternate_complete
, NULL
);
595 commit_list_sort_by_date(&complete
);
597 mark_recent_complete_commits(args
, cutoff
);
601 * Mark all complete remote refs as common refs.
602 * Don't mark them common yet; the server has to be told so first.
604 for (ref
= *refs
; ref
; ref
= ref
->next
) {
605 struct object
*o
= deref_tag(lookup_object(ref
->old_sha1
),
608 if (!o
|| o
->type
!= OBJ_COMMIT
|| !(o
->flags
& COMPLETE
))
611 if (!(o
->flags
& SEEN
)) {
612 rev_list_push((struct commit
*)o
, COMMON_REF
| SEEN
);
614 mark_common((struct commit
*)o
, 1, 1);
618 filter_refs(args
, refs
, sought
, nr_sought
);
620 for (retval
= 1, ref
= *refs
; ref
; ref
= ref
->next
) {
621 const unsigned char *remote
= ref
->old_sha1
;
622 unsigned char local
[20];
625 o
= lookup_object(remote
);
626 if (!o
|| !(o
->flags
& COMPLETE
)) {
631 "want %s (%s)\n", sha1_to_hex(remote
),
636 hashcpy(ref
->new_sha1
, local
);
640 "already have %s (%s)\n", sha1_to_hex(remote
),
646 static int sideband_demux(int in
, int out
, void *data
)
650 int ret
= recv_sideband("fetch-pack", xd
[0], out
);
655 static int get_pack(struct fetch_pack_args
*args
,
656 int xd
[2], char **pack_lockfile
)
659 const char *argv
[22];
662 const char **av
, *cmd_name
;
663 int do_keep
= args
->keep_pack
;
664 struct child_process cmd
;
667 memset(&demux
, 0, sizeof(demux
));
669 /* xd[] is talking with upload-pack; subprocess reads from
670 * xd[0], spits out band#2 to stderr, and feeds us band#1
671 * through demux->out.
673 demux
.proc
= sideband_demux
;
676 if (start_async(&demux
))
677 die("fetch-pack: unable to fork off sideband"
683 memset(&cmd
, 0, sizeof(cmd
));
687 if (!args
->keep_pack
&& unpack_limit
) {
688 struct pack_header header
;
690 if (read_pack_header(demux
.out
, &header
))
691 die("protocol error: bad pack header");
692 snprintf(hdr_arg
, sizeof(hdr_arg
),
693 "--pack_header=%"PRIu32
",%"PRIu32
,
694 ntohl(header
.hdr_version
), ntohl(header
.hdr_entries
));
695 if (ntohl(header
.hdr_entries
) < unpack_limit
)
701 if (alternate_shallow_file
) {
702 *av
++ = "--shallow-file";
703 *av
++ = alternate_shallow_file
;
709 *av
++ = cmd_name
= "index-pack";
711 if (!args
->quiet
&& !args
->no_progress
)
713 if (args
->use_thin_pack
)
714 *av
++ = "--fix-thin";
715 if (args
->lock_pack
|| unpack_limit
) {
716 int s
= sprintf(keep_arg
,
717 "--keep=fetch-pack %"PRIuMAX
" on ", (uintmax_t) getpid());
718 if (gethostname(keep_arg
+ s
, sizeof(keep_arg
) - s
))
719 strcpy(keep_arg
+ s
, "localhost");
722 if (args
->check_self_contained_and_connected
)
723 *av
++ = "--check-self-contained-and-connected";
726 *av
++ = cmd_name
= "unpack-objects";
727 if (args
->quiet
|| args
->no_progress
)
729 args
->check_self_contained_and_connected
= 0;
733 if (fetch_fsck_objects
>= 0
735 : transfer_fsck_objects
>= 0
736 ? transfer_fsck_objects
743 if (start_command(&cmd
))
744 die("fetch-pack: unable to fork off %s", cmd_name
);
745 if (do_keep
&& pack_lockfile
) {
746 *pack_lockfile
= index_pack_lockfile(cmd
.out
);
751 /* Closed by start_command() */
754 ret
= finish_command(&cmd
);
755 if (!ret
|| (args
->check_self_contained_and_connected
&& ret
== 1))
756 args
->self_contained_and_connected
=
757 args
->check_self_contained_and_connected
&&
760 die("%s failed", cmd_name
);
761 if (use_sideband
&& finish_async(&demux
))
762 die("error in sideband demultiplexer");
766 static int cmp_ref_by_name(const void *a_
, const void *b_
)
768 const struct ref
*a
= *((const struct ref
**)a_
);
769 const struct ref
*b
= *((const struct ref
**)b_
);
770 return strcmp(a
->name
, b
->name
);
773 static struct ref
*do_fetch_pack(struct fetch_pack_args
*args
,
775 const struct ref
*orig_ref
,
776 struct ref
**sought
, int nr_sought
,
777 struct shallow_info
*si
,
778 char **pack_lockfile
)
780 struct ref
*ref
= copy_ref_list(orig_ref
);
781 unsigned char sha1
[20];
782 const char *agent_feature
;
785 sort_ref_list(&ref
, ref_compare_name
);
786 qsort(sought
, nr_sought
, sizeof(*sought
), cmp_ref_by_name
);
788 if (is_repository_shallow() && !server_supports("shallow"))
789 die("Server does not support shallow clients");
790 if (server_supports("multi_ack_detailed")) {
792 fprintf(stderr
, "Server supports multi_ack_detailed\n");
794 if (server_supports("no-done")) {
796 fprintf(stderr
, "Server supports no-done\n");
797 if (args
->stateless_rpc
)
801 else if (server_supports("multi_ack")) {
803 fprintf(stderr
, "Server supports multi_ack\n");
806 if (server_supports("side-band-64k")) {
808 fprintf(stderr
, "Server supports side-band-64k\n");
811 else if (server_supports("side-band")) {
813 fprintf(stderr
, "Server supports side-band\n");
816 if (server_supports("allow-tip-sha1-in-want")) {
818 fprintf(stderr
, "Server supports allow-tip-sha1-in-want\n");
819 allow_tip_sha1_in_want
= 1;
821 if (!server_supports("thin-pack"))
822 args
->use_thin_pack
= 0;
823 if (!server_supports("no-progress"))
824 args
->no_progress
= 0;
825 if (!server_supports("include-tag"))
826 args
->include_tag
= 0;
827 if (server_supports("ofs-delta")) {
829 fprintf(stderr
, "Server supports ofs-delta\n");
831 prefer_ofs_delta
= 0;
833 if ((agent_feature
= server_feature_value("agent", &agent_len
))) {
835 if (args
->verbose
&& agent_len
)
836 fprintf(stderr
, "Server version is %.*s\n",
837 agent_len
, agent_feature
);
840 if (everything_local(args
, &ref
, sought
, nr_sought
)) {
844 if (find_common(args
, fd
, sha1
, ref
) < 0)
845 if (!args
->keep_pack
)
846 /* When cloning, it is not unusual to have
849 warning("no common commits");
851 if (args
->stateless_rpc
)
854 setup_alternate_shallow(&shallow_lock
, &alternate_shallow_file
,
856 else if (si
->nr_ours
|| si
->nr_theirs
)
857 alternate_shallow_file
= setup_temporary_shallow(si
->shallow
);
859 alternate_shallow_file
= NULL
;
860 if (get_pack(args
, fd
, pack_lockfile
))
861 die("git fetch-pack: fetch failed.");
867 static int fetch_pack_config(const char *var
, const char *value
, void *cb
)
869 if (strcmp(var
, "fetch.unpacklimit") == 0) {
870 fetch_unpack_limit
= git_config_int(var
, value
);
874 if (strcmp(var
, "transfer.unpacklimit") == 0) {
875 transfer_unpack_limit
= git_config_int(var
, value
);
879 if (strcmp(var
, "repack.usedeltabaseoffset") == 0) {
880 prefer_ofs_delta
= git_config_bool(var
, value
);
884 if (!strcmp(var
, "fetch.fsckobjects")) {
885 fetch_fsck_objects
= git_config_bool(var
, value
);
889 if (!strcmp(var
, "transfer.fsckobjects")) {
890 transfer_fsck_objects
= git_config_bool(var
, value
);
894 return git_default_config(var
, value
, cb
);
897 static void fetch_pack_setup(void)
899 static int did_setup
;
902 git_config(fetch_pack_config
, NULL
);
903 if (0 <= transfer_unpack_limit
)
904 unpack_limit
= transfer_unpack_limit
;
905 else if (0 <= fetch_unpack_limit
)
906 unpack_limit
= fetch_unpack_limit
;
910 static int remove_duplicates_in_refs(struct ref
**ref
, int nr
)
912 struct string_list names
= STRING_LIST_INIT_NODUP
;
915 for (src
= dst
= 0; src
< nr
; src
++) {
916 struct string_list_item
*item
;
917 item
= string_list_insert(&names
, ref
[src
]->name
);
919 continue; /* already have it */
920 item
->util
= ref
[src
];
925 for (src
= dst
; src
< nr
; src
++)
927 string_list_clear(&names
, 0);
931 static void update_shallow(struct fetch_pack_args
*args
,
932 struct ref
**sought
, int nr_sought
,
933 struct shallow_info
*si
)
935 struct sha1_array ref
= SHA1_ARRAY_INIT
;
939 if (args
->depth
> 0 && alternate_shallow_file
) {
940 if (*alternate_shallow_file
== '\0') { /* --unshallow */
941 unlink_or_warn(git_path("shallow"));
942 rollback_lock_file(&shallow_lock
);
944 commit_lock_file(&shallow_lock
);
948 if (!si
->shallow
|| !si
->shallow
->nr
)
953 * remote is shallow, but this is a clone, there are
954 * no objects in repo to worry about. Accept any
955 * shallow points that exist in the pack (iow in repo
956 * after get_pack() and reprepare_packed_git())
958 struct sha1_array extra
= SHA1_ARRAY_INIT
;
959 unsigned char (*sha1
)[20] = si
->shallow
->sha1
;
960 for (i
= 0; i
< si
->shallow
->nr
; i
++)
961 if (has_sha1_file(sha1
[i
]))
962 sha1_array_append(&extra
, sha1
[i
]);
964 setup_alternate_shallow(&shallow_lock
,
965 &alternate_shallow_file
,
967 commit_lock_file(&shallow_lock
);
969 sha1_array_clear(&extra
);
973 if (!si
->nr_ours
&& !si
->nr_theirs
)
976 remove_nonexistent_theirs_shallow(si
);
977 if (!si
->nr_ours
&& !si
->nr_theirs
)
979 for (i
= 0; i
< nr_sought
; i
++)
980 sha1_array_append(&ref
, sought
[i
]->old_sha1
);
983 if (args
->update_shallow
) {
985 * remote is also shallow, .git/shallow may be updated
986 * so all refs can be accepted. Make sure we only add
987 * shallow roots that are actually reachable from new
990 struct sha1_array extra
= SHA1_ARRAY_INIT
;
991 unsigned char (*sha1
)[20] = si
->shallow
->sha1
;
992 assign_shallow_commits_to_refs(si
, NULL
, NULL
);
993 if (!si
->nr_ours
&& !si
->nr_theirs
) {
994 sha1_array_clear(&ref
);
997 for (i
= 0; i
< si
->nr_ours
; i
++)
998 sha1_array_append(&extra
, sha1
[si
->ours
[i
]]);
999 for (i
= 0; i
< si
->nr_theirs
; i
++)
1000 sha1_array_append(&extra
, sha1
[si
->theirs
[i
]]);
1001 setup_alternate_shallow(&shallow_lock
,
1002 &alternate_shallow_file
,
1004 commit_lock_file(&shallow_lock
);
1005 sha1_array_clear(&extra
);
1006 sha1_array_clear(&ref
);
1011 * remote is also shallow, check what ref is safe to update
1012 * without updating .git/shallow
1014 status
= xcalloc(nr_sought
, sizeof(*status
));
1015 assign_shallow_commits_to_refs(si
, NULL
, status
);
1016 if (si
->nr_ours
|| si
->nr_theirs
) {
1017 for (i
= 0; i
< nr_sought
; i
++)
1019 sought
[i
]->status
= REF_STATUS_REJECT_SHALLOW
;
1022 sha1_array_clear(&ref
);
1025 struct ref
*fetch_pack(struct fetch_pack_args
*args
,
1026 int fd
[], struct child_process
*conn
,
1027 const struct ref
*ref
,
1029 struct ref
**sought
, int nr_sought
,
1030 struct sha1_array
*shallow
,
1031 char **pack_lockfile
)
1033 struct ref
*ref_cpy
;
1034 struct shallow_info si
;
1038 nr_sought
= remove_duplicates_in_refs(sought
, nr_sought
);
1041 packet_flush(fd
[1]);
1042 die("no matching remote head");
1044 prepare_shallow_info(&si
, shallow
);
1045 ref_cpy
= do_fetch_pack(args
, fd
, ref
, sought
, nr_sought
,
1046 &si
, pack_lockfile
);
1047 reprepare_packed_git();
1048 update_shallow(args
, sought
, nr_sought
, &si
);
1049 clear_shallow_info(&si
);