Merge branch 'rr/die-on-missing-upstream' into maint
commitb3bf469bf8d4cff6fbfef7db1c6f74b63906a317
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)
treeefcf1eff3f7801a688f0cdad940bfe995dfba427
parentdfc6b040d0f01a1fcec7acce6a3eda22b41a4933
parent305ebea06d5e633e3d648c798b5e6bb2b9abf361
Merge branch 'rr/die-on-missing-upstream' into maint

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}
sha1_name.c