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@xxxxxxxxx>
---
builtin-remote.c | 26 ++++++++++++++++++++++++++
t/t5505-remote.sh | 3 ++-
2 files changed, 28 insertions(+), 1 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;
diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh
index eb63718..826d0c3 100755
--- a/t/t5505-remote.sh
+++ b/t/t5505-remote.sh
@@ -136,6 +136,7 @@ EOF
cat > test/expect << EOF
* remote origin
URL: $(pwd)/one
+ HEAD: master
Remote branch merged with 'git pull' while on branch master
master
New remote branch (next fetch will store in remotes/origin)
@@ -343,7 +344,7 @@ test_expect_success '"remote show" does not show symbolic refs' '
git clone one three &&
(cd three &&
git remote show origin > output &&
- ! grep HEAD < output &&
+ ! grep "^ *HEAD$" < output &&
! grep -i stale < output)
'
--
1.6.2.rc1.291.g83eb
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
