summaryrefslogtreecommitdiff
path: root/sha1_name.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-06-11 13:29:58 -0700
committerJunio C Hamano <gitster@pobox.com>2013-06-11 13:29:59 -0700
commit03b1558208f02df6f5a74d22fcc8a751f9470b95 (patch)
treefc37b0091fe4705563e58727290104faf6d4610f /sha1_name.c
parent39fd762572d42a118e577d9095d83d84f3db9ddf (diff)
parent305ebea06d5e633e3d648c798b5e6bb2b9abf361 (diff)
downloadgit-03b1558208f02df6f5a74d22fcc8a751f9470b95.tar.gz
Merge branch 'rr/die-on-missing-upstream'
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}
Diffstat (limited to 'sha1_name.c')
-rw-r--r--sha1_name.c24
1 files changed, 17 insertions, 7 deletions
diff --git a/sha1_name.c b/sha1_name.c
index 371a49d98d..b3a90e6f05 100644
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -517,12 +517,21 @@ static int get_sha1_basic(const char *str, int len, unsigned char *sha1)
}
if (read_ref_at(real_ref, at_time, nth, sha1, NULL,
&co_time, &co_tz, &co_cnt)) {
+ if (!len) {
+ if (!prefixcmp(real_ref, "refs/heads/")) {
+ str = real_ref + 11;
+ len = strlen(real_ref + 11);
+ } else {
+ /* detached HEAD */
+ str = "HEAD";
+ len = 4;
+ }
+ }
if (at_time)
warning("Log for '%.*s' only goes "
"back to %s.", len, str,
show_date(co_time, co_tz, DATE_RFC2822));
else {
- free(real_ref);
die("Log for '%.*s' only has %d entries.",
len, str, co_cnt);
}
@@ -1033,14 +1042,15 @@ int interpret_branch_name(const char *name, struct strbuf *buf)
* points to something different than a branch.
*/
if (!upstream)
- return error(_("HEAD does not point to a branch"));
+ die(_("HEAD does not point to a branch"));
if (!upstream->merge || !upstream->merge[0]->dst) {
if (!ref_exists(upstream->refname))
- return error(_("No such branch: '%s'"), cp);
- if (!upstream->merge)
- return error(_("No upstream configured for branch '%s'"),
- upstream->name);
- return error(
+ die(_("No such branch: '%s'"), cp);
+ if (!upstream->merge) {
+ die(_("No upstream configured for branch '%s'"),
+ upstream->name);
+ }
+ die(
_("Upstream branch '%s' not stored as a remote-tracking branch"),
upstream->merge[0]->src);
}