Files
git/builtin
Junio C Hamano b9f2e1a684 checkout: omit "tracking" information on a detached HEAD
By definition, a detached HEAD state is tentative and there is no
configured "upstream" that it always wants to integrate with.  But
if you detach from a branch that is behind its upstream, e.g.,

    $ git checkout -t -b main origin/main
    $ git checkout main
    $ git reset --hard HEAD^
    $ git checkout --detach main

you'd see "you are behind your upstream origin/main".  This does not
happen when you replace the last step in the above with any of these

    $ git checkout HEAD^0
    $ git checkout --detach HEAD
    $ git checkout --detach origin/main

Before 32669671 (checkout: introduce --detach synonym for "git
checkout foo^{commit}", 2011-02-08) introduced the "--detach"
option, the rule to decide if we show the tracking information
used to be:

    If --quiet is not given, and if the given branch name is a real
    local branch (i.e. the one we can compute the file path under
    .git/, like 'refs/heads/master' or "HEAD" which stand for the
    name of the current branch", then give the tracking information.

to exclude things like "git checkout master^0" (which was the
official way to detach HEAD at the commit before that commit) and
"git checkout origin/master^0" from showing tracking information,
but still do show the tracking information for the current branch
for "git checkout HEAD".  The introduction of an explicit option
"--detach" broke this subtley.  The new rule should have been

    If --quiet is given, do not bother with tracking info.
    If --detach is given, do not bother with tracking info.

    Otherwise, if we know that the branch name given is a real local
    branch, or if we were given "HEAD" and "HEAD" is not detached,
    then attempt to show the tracking info.

but it allowed "git checkout --detach master" to also show the
tracking info by mistake.  Let's tighten the rule to fix this.

Reported-by: mirth hickford <mirth.hickford@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2024-03-30 17:53:25 -07:00
..
2024-03-07 15:59:41 -08:00
2024-03-28 14:13:50 -07:00
2024-03-28 14:13:50 -07:00
2024-03-28 14:13:50 -07:00
2024-02-13 10:18:50 -08:00
2024-01-29 10:27:53 -08:00
2024-02-12 09:32:41 -08:00
2024-01-18 12:17:42 -08:00
2024-03-28 14:13:50 -07:00
2023-07-06 11:54:48 -07:00
2024-01-08 14:05:15 -08:00
2024-03-28 14:13:50 -07:00
2024-03-28 14:13:50 -07:00
2024-02-26 09:35:40 -08:00
2023-07-06 11:54:48 -07:00
2024-03-28 14:13:50 -07:00
2024-03-07 15:59:41 -08:00
2024-03-28 14:13:50 -07:00
2024-03-28 14:13:50 -07:00
2023-07-06 11:54:46 -07:00
2024-03-28 14:13:50 -07:00
2024-01-18 12:17:41 -08:00