tree e95738e380852775d16806643a57ece2d4d39461
parent 7364aee138326303371c1a17d3259912366c1b55
parent f24c30e0b6b13078d8fc7cd71b9989d28fd76610
author Junio C Hamano <gitster@pobox.com> 1599684788 -0700
committer Junio C Hamano <gitster@pobox.com> 1599684789 -0700

Merge branch 'jt/interpret-branch-name-fallback'

"git status" has trouble showing where it came from by interpreting
reflog entries that recordcertain events, e.g. "checkout @{u}", and
gives a hard/fatal error.  Even though it inherently is impossible
to give a correct answer because the reflog entries lose some
information (e.g. "@{u}" does not record what branch the user was
on hence which branch 'the upstream' needs to be computed, and even
if the record were available, the relationship between branches may
have changed), at least hide the error to allow "status" show its
output.

* jt/interpret-branch-name-fallback:
  wt-status: tolerate dangling marks
  refs: move dwim_ref() to header file
  sha1-name: replace unsigned int with option struct