mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

status: don't say 'HEAD detached at HEAD'

Browse Source 
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 <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Matthieu Moy
2015-09-27 17:13:42 +02:00
committed by Junio C Hamano
parent 9cb07d81b3
commit 0eb8548f45
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
t/t3203-branch-output.sh
View File

@ -106,7 +106,7 @@ EOF
test_i18ncmp expect actual test_i18ncmp expect actual
' '
test_expect_failure 'git branch shows detached HEAD properly after checkout --detach' ' test_expect_success 'git branch shows detached HEAD properly after checkout --detach' '
git checkout master && git checkout master &&
cat >expect <<EOF && cat >expect <<EOF &&
* (HEAD detached at $(git rev-parse --short HEAD^0)) * (HEAD detached at $(git rev-parse --short HEAD^0))

6
wt-status.c
View File

@ -1204,6 +1204,12 @@ static int grab_1st_switch(unsigned char *osha1, unsigned char *nsha1,
hashcpy(cb->nsha1, nsha1); hashcpy(cb->nsha1, nsha1);
for (end = target; *end && *end != '\n'; end++) 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); strbuf_add(&cb->buf, target, end - target);
return 1; return 1;
} }