git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jay Soffian <jaysoffian@gmail.com>
To: git@vger.kernel.org
Cc: Jay Soffian <jaysoffian@gmail.com>,
	peff@peff.net, gitster@pobox.com, barkalow@iabervon.org
Subject: [PATCH 3/4] builtin-remote: teach show to display remote HEAD
Date: Fri, 13 Feb 2009 03:54:34 -0500	[thread overview]
Message-ID: <1234515275-91263-4-git-send-email-jaysoffian@gmail.com> (raw)
In-Reply-To: <1234515275-91263-3-git-send-email-jaysoffian@gmail.com>

This is in preparation for teaching remote how to set
refs/remotes/<remote>/HEAD to match what HEAD is set to at <remote>, but
is useful in its own right.

Signed-off-by: Jay Soffian <jaysoffian@gmail.com>
---
 builtin-remote.c |   26 ++++++++++++++++++++++++++
 1 files changed, 26 insertions(+), 0 deletions(-)

diff --git a/builtin-remote.c b/builtin-remote.c
index b89a353..465c87a 100644
--- a/builtin-remote.c
+++ b/builtin-remote.c
@@ -212,6 +212,7 @@ static void read_branches(void)
 struct ref_states {
 	struct remote *remote;
 	struct string_list new, stale, tracked;
+	char *head_name;
 };
 
 static int handle_one_branch(const char *refname,
@@ -271,6 +272,26 @@ static int get_ref_states(const struct ref *ref, struct ref_states *states)
 	return 0;
 }
 
+static char *get_head_name(const struct ref *refs)
+{
+	const struct ref *head_points_at;
+	struct ref *mapped_refs = NULL;
+	struct ref **tail = &mapped_refs;
+	struct refspec refspec;
+
+	refspec.force = 0;
+	refspec.pattern = 1;
+	refspec.src = refspec.dst = "refs/heads/";
+
+	get_fetch_map(refs, &refspec, &tail, 0);
+
+	head_points_at = guess_remote_head(refs, mapped_refs, NULL);
+	if (head_points_at)
+		return xstrdup(abbrev_branch(head_points_at->name));
+
+	return NULL;
+}
+
 struct known_remote {
 	struct known_remote *next;
 	struct remote *remote;
@@ -637,6 +658,7 @@ static void free_remote_ref_states(struct ref_states *states)
 	string_list_clear(&states->new, 0);
 	string_list_clear(&states->stale, 0);
 	string_list_clear(&states->tracked, 0);
+	free(states->head_name);
 }
 
 static int get_remote_ref_states(const char *name,
@@ -658,6 +680,7 @@ static int get_remote_ref_states(const char *name,
 		ref = transport_get_remote_refs(transport);
 		transport_disconnect(transport);
 
+		states->head_name = get_head_name(ref);
 		get_ref_states(ref, states);
 	}
 
@@ -702,6 +725,9 @@ static int show(int argc, const char **argv)
 		printf("* remote %s\n  URL: %s\n", *argv,
 			states.remote->url_nr > 0 ?
 				states.remote->url[0] : "(no URL)");
+		if (!no_query)
+			printf("  HEAD: %s\n", states.head_name ?
+				states.head_name : "(unknown)");
 
 		for (i = 0; i < branch_list.nr; i++) {
 			struct string_list_item *branch = branch_list.items + i;
-- 
1.6.2.rc0.209.g7c178

  reply	other threads:[~2009-02-13  8:56 UTC|newest]

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-02-13  8:54 [PATCH 0/4] remote HEAD improvements take 2 Jay Soffian
2009-02-13  8:54 ` [PATCH 1/4] builtin-clone: move locate_head() to remote.c so it can be re-used Jay Soffian
2009-02-13  8:54   ` [PATCH 2/4] builtin-remote: move duplicated cleanup code its own function Jay Soffian
2009-02-13  8:54     ` Jay Soffian [this message]
2009-02-13  8:54       ` [PATCH 4/4] builtin-remote: add set-head verb Jay Soffian
2009-02-13 10:09         ` Junio C Hamano
2009-02-13 10:21           ` Jay Soffian
2009-02-13 11:42             ` [PATCH v2 4/4] builtin-remote: add set-head subcommand Jay Soffian
2009-02-13 10:35           ` [PATCH 4/4] builtin-remote: add set-head verb Junio C Hamano
2009-02-13 10:52             ` Jay Soffian
2009-02-14  0:22           ` Jeff King
2009-02-14  2:00             ` Junio C Hamano
2009-02-14  2:18               ` Jeff King
2009-02-14  2:48                 ` Jay Soffian
2009-02-14  2:59               ` Jay Soffian
2009-02-14  3:43                 ` Jeff King
2009-02-14 10:30                   ` [PATCH] builtin-remote: better handling of multiple remote HEADs Jay Soffian
2009-02-14 17:54                     ` Jeff King
2009-02-14 18:35                       ` Jay Soffian
2009-02-14 18:54                         ` Jeff King
2009-02-14 19:48                           ` Junio C Hamano
2009-02-14 20:21                       ` Daniel Barkalow
2009-02-14 21:15                         ` Jeff King
2009-02-15  6:08                           ` Jeff King
2009-02-15  6:10                             ` [PATCH 1/5] test scripts: refactor start_httpd helper Jeff King
2009-02-15  6:12                             ` [PATCH 2/5] add basic http clone/fetch tests Jeff King
2009-02-15  8:01                               ` Junio C Hamano
2009-02-15  6:12                             ` [PATCH 3/5] refactor find_refs_by_name to accept const list Jeff King
2009-02-15  6:16                             ` [PATCH 4/5] remote: refactor guess_remote_head Jeff King
2009-02-15  6:18                             ` [PATCH 5/5] remote: use exact HEAD lookup if it is available Jeff King
2009-02-15 15:22                               ` Jay Soffian
2009-02-15 19:58                               ` Jeff King
2009-02-15 20:00                                 ` [PATCH 1/2] transport: cleanup duplicated ref fetching code Jeff King
2009-02-15 20:01                                 ` [PATCH 2/2] transport: unambiguously determine local HEAD Jeff King
2009-02-15  5:27                     ` [PATCH] builtin-remote: better handling of multiple remote HEADs Jeff King
2009-02-15  5:34                       ` Jeff King
2009-02-15 14:13                       ` Jay Soffian
2009-02-15 15:12                         ` Jeff King
2009-02-16  2:21                         ` Junio C Hamano
2009-02-16  2:58                           ` Jay Soffian
2009-02-13  8:57 ` [PATCH 0/4] remote HEAD improvements take 2 Jay Soffian

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=1234515275-91263-4-git-send-email-jaysoffian@gmail.com \
    --to=jaysoffian@gmail.com \
    --cc=barkalow@iabervon.org \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.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.
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 NNTP newsgroup(s).