Only small, straightforward adjustments, mostly based on Jonathan's
comments.
The one exception is passing the default refspec using
strbuf_detach(), because add_fetch_refspec() doesn't make a copy of it
internally. It doesn't make any difference in practice, because
strbuf default_refspec remains unaltered til the very end, but this is
the right thing to do.
SZEDER Gábor (2):
clone: respect additional configured fetch refspecs during initial
fetch
Documentation/clone: document ignored configuration variables
Documentation/git-clone.txt | 5 +++++
builtin/clone.c | 36 ++++++++++++++++++----------------
remote.c | 13 +++++++++++++
remote.h | 1 +
t/t5611-clone-config.sh | 47 +++++++++++++++++++++++++++++++++++++++++++++
5 files changed, 85 insertions(+), 17 deletions(-)
--
2.13.1.505.g7cc9fcafb
diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt
index 4f1e7d4ba..5ceccb258 100644
--- a/Documentation/git-clone.txt
+++ b/Documentation/git-clone.txt
@@ -186,10 +186,11 @@ objects from the source repository into a pack in the
cloned repository.
values are given for the same key, each value will be written to
the config file. This makes it safe, for example, to add
additional fetch refspecs to the origin remote.
- Note that due to limitations of the current implementation some
- configuration variables don't take effect during the initial
- fetch and checkout. Configuration variables known to not take
- effect are: `remote.<name>.mirror` and `remote.<name>.tagOpt`.
++
+Due to limitations if the current implementation, some configuration
+variables do not take effect until after the initial fetch and checkout.
+Configuration variables known to not take effect are:
+`remote.<name>.mirror` and `remote.<name>.tagOpt`.
--depth <depth>::
Create a 'shallow' clone with a history truncated to the
diff --git a/builtin/clone.c b/builtin/clone.c
index 4157922d8..8a7edd4e5 100644
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -853,7 +853,8 @@ int cmd_clone(int argc, const char **argv, const char
*prefix)
const struct ref *our_head_points_at;
struct ref *mapped_refs;
const struct ref *ref;
- struct strbuf key = STRBUF_INIT, default_refspec = STRBUF_INIT;
+ struct strbuf key = STRBUF_INIT;
+ struct strbuf default_refspec = STRBUF_INIT;
struct strbuf branch_top = STRBUF_INIT, reflog_msg = STRBUF_INIT;
struct transport *transport = NULL;
const char *src_ref_prefix = "refs/heads/";
@@ -987,7 +988,8 @@ int cmd_clone(int argc, const char **argv, const char
*prefix)
remote = remote_get(option_origin);
strbuf_addf(&default_refspec, "+%s*:%s*", src_ref_prefix,
branch_top.buf);
- add_and_parse_fetch_refspec(remote, default_refspec.buf);
+ add_and_parse_fetch_refspec(remote,
+ strbuf_detach(&default_refspec, NULL));
transport = transport_get(remote, remote->url[0]);
transport_set_verbosity(transport, option_verbosity, option_progress);
diff --git a/t/t5611-clone-config.sh b/t/t5611-clone-config.sh
index 114b53920..f240b22cc 100755
--- a/t/t5611-clone-config.sh
+++ b/t/t5611-clone-config.sh
@@ -43,7 +43,8 @@ test_expect_success 'clone -c remote.origin.fetch=<refspec>
works' '
git update-ref refs/leave/out refs/heads/master &&
git clone -c "remote.origin.fetch=+refs/grab/*:refs/grab/*" . child &&
git -C child for-each-ref --format="%(refname)" >actual &&
- cat >expect <<-EOF &&
+
+ cat >expect <<-\EOF &&
refs/grab/it
refs/heads/master
refs/remotes/origin/HEAD
@@ -56,7 +57,8 @@ test_expect_success 'git -c remote.origin.fetch=<refspec>
clone works' '
rm -rf child &&
git -c "remote.origin.fetch=+refs/grab/*:refs/grab/*" clone . child &&
git -C child for-each-ref --format="%(refname)" >actual &&
- cat >expect <<-EOF &&
+
+ cat >expect <<-\EOF &&
refs/grab/it
refs/heads/master
refs/remotes/origin/HEAD
@@ -72,7 +74,8 @@ test_expect_success 'clone -c remote.<remote>.fetch=<refspec>
--origin=<name>' '
-c "remote.origin.fetch=+refs/leave/*:refs/leave/*" \
. child &&
git -C child for-each-ref --format="%(refname)" >actual &&
- cat >expect <<-EOF &&
+
+ cat >expect <<-\EOF &&
refs/grab/it
refs/heads/master
refs/remotes/upstream/HEAD
