From: Christian Couder <christian.couder@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>, Jeff King <peff@peff.net>,
Ben Peart <Ben.Peart@microsoft.com>,
Jonathan Tan <jonathantanmy@google.com>,
Nguyen Thai Ngoc Duy <pclouds@gmail.com>,
Mike Hommey <mh@glandium.org>,
Lars Schneider <larsxschneider@gmail.com>,
Eric Wong <e@80x24.org>,
Christian Couder <chriscool@tuxfamily.org>
Subject: [PATCH v5 36/40] clone: add 'initial' param to write_remote_refs()
Date: Thu, 3 Aug 2017 11:19:22 +0200 [thread overview]
Message-ID: <20170803091926.1755-37-chriscool@tuxfamily.org> (raw)
In-Reply-To: <20170803091926.1755-1-chriscool@tuxfamily.org>
We want to make it possible to separate fetching remote refs into
an initial part and a later part. To prepare for that, let's add
an 'initial' boolean parameter to write_remote_refs() to tell this
function if we are performing the initial part or not.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
builtin/clone.c | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/builtin/clone.c b/builtin/clone.c
index 4b5340c55f..2362dda880 100644
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -573,7 +573,7 @@ static struct ref *wanted_peer_refs(const struct ref *refs,
return local_refs;
}
-static void write_remote_refs(const struct ref *local_refs)
+static void write_remote_refs(const struct ref *local_refs, int initial)
{
const struct ref *r;
@@ -592,8 +592,13 @@ static void write_remote_refs(const struct ref *local_refs)
die("%s", err.buf);
}
- if (initial_ref_transaction_commit(t, &err))
- die("%s", err.buf);
+ if (initial) {
+ if (initial_ref_transaction_commit(t, &err))
+ die("%s", err.buf);
+ } else {
+ if (ref_transaction_commit(t, &err))
+ die("%s", err.buf);
+ }
strbuf_release(&err);
ref_transaction_free(t);
@@ -640,7 +645,8 @@ static void update_remote_refs(const struct ref *refs,
const char *branch_top,
const char *msg,
struct transport *transport,
- int check_connectivity)
+ int check_connectivity,
+ int initial)
{
const struct ref *rm = mapped_refs;
@@ -655,7 +661,7 @@ static void update_remote_refs(const struct ref *refs,
}
if (refs) {
- write_remote_refs(mapped_refs);
+ write_remote_refs(mapped_refs, initial);
if (option_single_branch && !option_no_tags)
write_followtags(refs, msg);
}
@@ -1164,7 +1170,8 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
transport_fetch_refs(transport, mapped_refs);
update_remote_refs(refs, mapped_refs, remote_head_points_at,
- branch_top.buf, reflog_msg.buf, transport, !is_local);
+ branch_top.buf, reflog_msg.buf, transport,
+ !is_local, 0);
update_head(our_head_points_at, remote_head, reflog_msg.buf);
--
2.14.0.rc1.52.gf02fb0ddac.dirty
next prev parent reply other threads:[~2017-08-03 9:20 UTC|newest]
Thread overview: 73+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-03 9:18 [PATCH v5 00/40] Add initial experimental external ODB support Christian Couder
2017-08-03 9:18 ` [PATCH v5 01/40] builtin/clone: get rid of 'value' strbuf Christian Couder
2017-08-03 9:18 ` [PATCH v5 02/40] t0021/rot13-filter: refactor packet reading functions Christian Couder
2017-08-03 9:18 ` [PATCH v5 03/40] t0021/rot13-filter: improve 'if .. elsif .. else' style Christian Couder
2017-08-03 9:18 ` [PATCH v5 04/40] Add Git/Packet.pm from parts of t0021/rot13-filter.pl Christian Couder
2017-08-03 19:11 ` Junio C Hamano
2017-08-04 6:32 ` Christian Couder
2017-08-03 9:18 ` [PATCH v5 05/40] t0021/rot13-filter: use Git/Packet.pm Christian Couder
2017-08-03 9:18 ` [PATCH v5 06/40] Git/Packet.pm: improve error message Christian Couder
2017-08-03 9:18 ` [PATCH v5 07/40] Git/Packet.pm: add packet_initialize() Christian Couder
2017-08-03 9:18 ` [PATCH v5 08/40] Git/Packet.pm: add capability functions Christian Couder
2017-08-03 19:14 ` Junio C Hamano
2017-08-04 20:34 ` Christian Couder
2017-08-03 9:18 ` [PATCH v5 09/40] sha1_file: prepare for external odbs Christian Couder
2017-08-03 9:18 ` [PATCH v5 10/40] Add initial external odb support Christian Couder
2017-08-03 19:34 ` Junio C Hamano
2017-08-03 20:17 ` Jeff King
2017-09-14 10:14 ` Christian Couder
2017-08-03 9:18 ` [PATCH v5 11/40] odb-helper: add odb_helper_init() to send 'init' instruction Christian Couder
2017-09-10 12:12 ` Lars Schneider
2017-09-14 7:18 ` Christian Couder
2017-08-03 9:18 ` [PATCH v5 12/40] t0400: add 'put_raw_obj' instruction to odb-helper script Christian Couder
2017-09-10 12:12 ` Lars Schneider
2017-09-14 7:09 ` Christian Couder
2017-08-03 9:18 ` [PATCH v5 13/40] external odb: add 'put_raw_obj' support Christian Couder
2017-08-03 19:50 ` Junio C Hamano
2017-09-14 9:17 ` Christian Couder
2017-08-03 9:19 ` [PATCH v5 14/40] external-odb: accept only blobs for now Christian Couder
2017-08-03 19:52 ` Junio C Hamano
2017-09-14 9:59 ` Christian Couder
2017-08-03 9:19 ` [PATCH v5 15/40] t0400: add test for external odb write support Christian Couder
2017-08-03 9:19 ` [PATCH v5 16/40] Add GIT_NO_EXTERNAL_ODB env variable Christian Couder
2017-08-03 9:19 ` [PATCH v5 17/40] Add t0410 to test external ODB transfer Christian Couder
2017-08-03 9:19 ` [PATCH v5 18/40] lib-httpd: pass config file to start_httpd() Christian Couder
2017-08-03 9:19 ` [PATCH v5 19/40] lib-httpd: add upload.sh Christian Couder
2017-08-03 20:07 ` Junio C Hamano
2017-09-14 7:43 ` Christian Couder
2017-08-03 9:19 ` [PATCH v5 20/40] lib-httpd: add list.sh Christian Couder
2017-08-03 9:19 ` [PATCH v5 21/40] lib-httpd: add apache-e-odb.conf Christian Couder
2017-08-03 9:19 ` [PATCH v5 22/40] odb-helper: add odb_helper_get_raw_object() Christian Couder
2017-08-03 9:19 ` [PATCH v5 23/40] pack-objects: don't pack objects in external odbs Christian Couder
2017-08-03 9:19 ` [PATCH v5 24/40] Add t0420 to test transfer to HTTP external odb Christian Couder
2017-08-03 9:19 ` [PATCH v5 25/40] external-odb: add 'get_direct' support Christian Couder
2017-08-03 21:40 ` Junio C Hamano
2017-09-14 8:39 ` Christian Couder
2017-09-14 18:19 ` Jonathan Tan
2017-09-15 11:24 ` Christian Couder
2017-09-15 20:54 ` Jonathan Tan
2017-08-03 9:19 ` [PATCH v5 26/40] odb-helper: add 'script_mode' to 'struct odb_helper' Christian Couder
2017-08-03 9:19 ` [PATCH v5 27/40] odb-helper: add init_object_process() Christian Couder
2017-08-03 9:19 ` [PATCH v5 28/40] Add t0450 to test 'get_direct' mechanism Christian Couder
2017-08-03 9:19 ` [PATCH v5 29/40] Add t0460 to test passing git objects Christian Couder
2017-08-03 9:19 ` [PATCH v5 30/40] odb-helper: add put_object_process() Christian Couder
2017-08-03 9:19 ` [PATCH v5 31/40] Add t0470 to test passing raw objects Christian Couder
2017-08-03 9:19 ` [PATCH v5 32/40] odb-helper: add have_object_process() Christian Couder
2017-08-03 9:19 ` [PATCH v5 33/40] Add t0480 to test "have" capability and raw objects Christian Couder
2017-08-03 9:19 ` [PATCH v5 34/40] external-odb: use 'odb=magic' attribute to mark odb blobs Christian Couder
2017-08-03 9:19 ` [PATCH v5 35/40] Add Documentation/technical/external-odb.txt Christian Couder
2017-08-03 18:38 ` Stefan Beller
2017-08-25 6:14 ` Christian Couder
2017-08-25 21:23 ` Jonathan Tan
2017-08-29 9:37 ` Christian Couder
2017-08-28 18:59 ` Ben Peart
2017-08-29 15:43 ` Christian Couder
2017-08-30 12:50 ` Ben Peart
2017-08-30 14:15 ` Christian Couder
2017-08-03 9:19 ` Christian Couder [this message]
2017-08-03 9:19 ` [PATCH v5 37/40] clone: add --initial-refspec option Christian Couder
2017-08-03 9:19 ` [PATCH v5 38/40] clone: disable external odb before initial clone Christian Couder
2017-08-03 9:19 ` [PATCH v5 39/40] Add tests for 'clone --initial-refspec' Christian Couder
2017-08-03 9:19 ` [PATCH v5 40/40] Add t0430 to test cloning using bundles Christian Couder
2017-09-10 12:30 ` [PATCH v5 00/40] Add initial experimental external ODB support Lars Schneider
2017-09-14 7:02 ` Christian Couder
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170803091926.1755-37-chriscool@tuxfamily.org \
--to=christian.couder@gmail.com \
--cc=Ben.Peart@microsoft.com \
--cc=chriscool@tuxfamily.org \
--cc=e@80x24.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jonathantanmy@google.com \
--cc=larsxschneider@gmail.com \
--cc=mh@glandium.org \
--cc=pclouds@gmail.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).