Merge branch 'rr/die-on-missing-upstream' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 3 Jul 2013 22:30:24 +0000 (3 15:30 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 3 Jul 2013 22:30:24 +0000 (3 15:30 -0700)
When a reflog notation is used for implicit "current branch", we did
not say which branch, and worse said "branch ''".

* rr/die-on-missing-upstream:
  sha1_name: fix error message for @{<N>}, @{<date>}
  sha1_name: fix error message for @{u}

1  2 
sha1_name.c

diff --cc sha1_name.c
Simple merge