diff options
| author | Michael J Gruber <git@drmicha.warpmail.net> | 2015-03-06 16:04:07 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-06 11:52:46 -0800 |
| commit | 4b06318664638d306cad920fd86eb63b69739310 (patch) | |
| tree | be93513315720167f6080b459e1041651bb1f623 /builtin | |
| parent | 970399e74c14df4dc82f10e1fcd0f12531e9b305 (diff) | |
| download | git-4b06318664638d306cad920fd86eb63b69739310.tar.gz git-4b06318664638d306cad920fd86eb63b69739310.tar.xz | |
branch: name detached HEAD analogous to status
"git status" carefully names a detached HEAD "at" resp. "from" a rev or
ref depending on whether the detached HEAD has moved since. "git branch"
always uses "from", which can be confusing, because a status-aware user
would interpret this as moved detached HEAD.
Make "git branch" use the same logic and wording.
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/branch.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/builtin/branch.c b/builtin/branch.c index dc6f0b266..46ad6f5b0 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -589,9 +589,16 @@ static char *get_head_description(void) else if (state.bisect_in_progress) strbuf_addf(&desc, _("(no branch, bisect started on %s)"), state.branch); - else if (state.detached_from) - strbuf_addf(&desc, _("(detached from %s)"), - state.detached_from); + else if (state.detached_from) { + /* TRANSLATORS: make sure these match _("HEAD detached at ") + and _("HEAD detached from ") in wt-status.c */ + if (state.detached_at) + strbuf_addf(&desc, _("(HEAD detached at %s)"), + state.detached_from); + else + strbuf_addf(&desc, _("(HEAD detached from %s)"), + state.detached_from); + } else strbuf_addstr(&desc, _("(no branch)")); free(state.branch); |