All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Ralf Thielow <ralf.thielow@gmail.com>
Cc: pclouds@gmail.com, git@vger.kernel.org
Subject: Re: [PATCH] clone: fix refspec on "--single-branch" option
Date: Fri, 14 Sep 2012 11:42:05 -0700	[thread overview]
Message-ID: <7vhar04fb6.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <7vipbh6qxa.fsf@alter.siamese.dyndns.org> (Junio C. Hamano's message of "Thu, 13 Sep 2012 23:48:17 -0700")

Junio C Hamano <gitster@pobox.com> writes:

> Alternatively, if you can move the logic to set up this
> configuration further down so that it happens after we talked to the
> other side and figured out remote_head_points_at, you could instead
> set it up to keep a single remote tracking branch.
>
> Even if you did so, guess_remote_head() may not find any branch when
> the other repository's HEAD is detached, so you would need to decide
> what to do in such a case, and "fetch and integrate their HEAD
> without using any remote tracking branch" may be a reasonable thing
> to do in such a case.

Along the lines of this, perhaps.

 builtin/clone.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git i/builtin/clone.c w/builtin/clone.c
index 5e8f3ba..c9e099d 100644
--- i/builtin/clone.c
+++ w/builtin/clone.c
@@ -853,6 +853,22 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
 					      "refs/heads/master");
 	}
 
+	if (option_single_branch) {
+		/* Fix up the refspec for fetch */
+		strbuf_reset(&value);
+		if (!remote_head_points_at)
+			strbuf_addf(&value, "HEAD");
+		else
+			strbuf_addf(&value, "%s:%s%s",
+				    remote_head_points_at->name,
+				    branch_top.buf,
+				    skip_prefix(remote_head_points_at->name, "refs/heads/"));
+
+		strbuf_reset(&key);
+		strbuf_addf(&key, "remote.%s.fetch", option_origin);
+		git_config_set_multivar(key.buf, value.buf, NULL, 1);
+	}
+
 	if (is_local)
 		clone_local(path, git_dir);
 	else if (refs && complete_refs_before_fetch)

      parent reply	other threads:[~2012-09-14 18:42 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-09-13 18:38 is this behaviour expected for "git clone --single-branch"? Ralf Thielow
2012-09-13 18:45 ` Junio C Hamano
2012-09-13 18:48   ` Ralf Thielow
2012-09-14  5:09     ` [PATCH] clone: fix refspec on "--single-branch" option Ralf Thielow
2012-09-14  5:35       ` Junio C Hamano
2012-09-14  6:48         ` Junio C Hamano
2012-09-14 13:10           ` Nguyen Thai Ngoc Duy
2012-09-14 14:25             ` Ralf Thielow
2012-09-14 16:02             ` Junio C Hamano
2012-09-14 18:11           ` [PATCHv2] " Ralf Thielow
2012-09-14 19:22             ` Junio C Hamano
2012-09-14 21:13               ` [PATCHv3] " Ralf Thielow
2012-09-14 22:45                 ` Junio C Hamano
2012-09-16  8:13                   ` [PATCHv4] clone --single: limit the fetch refspec to fetched branch Ralf Thielow
2012-09-17  4:48                     ` Junio C Hamano
2012-09-17 12:06                     ` Nguyen Thai Ngoc Duy
2012-09-17 12:11                       ` Nguyen Thai Ngoc Duy
2012-09-17 19:21                         ` [PATCHv5] " Ralf Thielow
2012-09-17 20:18                           ` Junio C Hamano
2012-09-17 21:04                             ` Ralf Thielow
2012-09-17 21:39                               ` Junio C Hamano
2012-09-18 14:08                                 ` Ralf Thielow
2012-09-18 16:57                                   ` Junio C Hamano
2012-09-18 19:14                           ` [PATCHv6] " Ralf Thielow
2012-09-18 19:42                             ` Junio C Hamano
2012-09-18 19:45                             ` Junio C Hamano
2012-09-19 16:45                               ` [PATCHv7] " Ralf Thielow
2012-09-19 23:26                                 ` Junio C Hamano
2012-09-20 18:04                                   ` [PATCHv8] " Ralf Thielow
2012-09-20 21:17                                     ` Junio C Hamano
2012-09-19  7:36                             ` [PATCHv6] " Nguyen Thai Ngoc Duy
2012-09-19  8:24                               ` Ralf Thielow
2012-09-17 20:09                         ` [PATCHv4] " Junio C Hamano
2012-09-18  1:04                           ` Nguyen Thai Ngoc Duy
2012-09-18  3:56                             ` Junio C Hamano
2012-09-17 13:25                       ` Ralf Thielow
2012-09-17 20:08                       ` Junio C Hamano
2012-09-18  1:02                         ` Nguyen Thai Ngoc Duy
2012-09-14 18:42           ` Junio C Hamano [this message]

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=7vhar04fb6.fsf@alter.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=pclouds@gmail.com \
    --cc=ralf.thielow@gmail.com \
    /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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.