From 0eb8548f45cc51bff9b70f551f4c472af353a814 Mon Sep 17 00:00:00 2001 From: Matthieu Moy Date: Sun, 27 Sep 2015 17:13:42 +0200 Subject: status: don't say 'HEAD detached at HEAD' After using "git checkout --detach", the reflog is left with an entry like checkout: moving from ... to HEAD This message is parsed to generate the 'HEAD detached at' message in 'git branch' and 'git status', which leads to the not-so-useful message 'HEAD detached at HEAD'. Instead, when parsing such reflog entry, resolve HEAD to the corresponding commit in the reflog, so that the message becomes 'HEAD detached at $sha1'. Signed-off-by: Matthieu Moy Signed-off-by: Junio C Hamano --- wt-status.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'wt-status.c') diff --git a/wt-status.c b/wt-status.c index 078a472743..fd9d98b399 100644 --- a/wt-status.c +++ b/wt-status.c @@ -1204,6 +1204,12 @@ static int grab_1st_switch(unsigned char *osha1, unsigned char *nsha1, hashcpy(cb->nsha1, nsha1); for (end = target; *end && *end != '\n'; end++) ; + if (!memcmp(target, "HEAD", end - target)) { + /* HEAD is relative. Resolve it to the right reflog entry. */ + strbuf_addstr(&cb->buf, + find_unique_abbrev(nsha1, DEFAULT_ABBREV)); + return 1; + } strbuf_add(&cb->buf, target, end - target); return 1; } -- cgit v1.2.3