summaryrefslogtreecommitdiff
path: root/t/t6425-merge-rename-delete.sh
diff options
context:
space:
mode:
authorLibravatar Jonathan Tan <jonathantanmy@google.com>2020-09-01 15:28:09 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-09-02 14:39:25 -0700
commitf24c30e0b6b13078d8fc7cd71b9989d28fd76610 (patch)
tree9b013a5a9bede34aacc64ccdb958ecb6505d826c /t/t6425-merge-rename-delete.sh
parentrefs: move dwim_ref() to header file (diff)
downloadtgif-f24c30e0b6b13078d8fc7cd71b9989d28fd76610.tar.xz
wt-status: tolerate dangling marks
When a user checks out the upstream branch of HEAD, the upstream branch not being a local branch, and then runs "git status", like this: git clone $URL client cd client git checkout @{u} git status no status is printed, but instead an error message: fatal: HEAD does not point to a branch (This error message when running "git branch" persists even after checking out other things - it only stops after checking out a branch.) This is because "git status" reads the reflog when determining the "HEAD detached" message, and thus attempts to DWIM "@{u}", but that doesn't work because HEAD no longer points to a branch. Therefore, when calculating the status of a worktree, tolerate dangling marks. This is done by adding an additional parameter to dwim_ref() and repo_dwim_ref(). Signed-off-by: Jonathan Tan <jonathantanmy@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6425-merge-rename-delete.sh')
0 files changed, 0 insertions, 0 deletions