Skip to content
  • Junio C Hamano's avatar
    Merge branch 'jt/interpret-branch-name-fallback' · 0df670bc
    Junio C Hamano authored
    "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
    0df670bc