From: Ramkumar Ramachandra <artagnon@gmail.com>
To: Git List <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>
Subject: [PATCH 2/2] sha1_name: fix error message for @{<N>}, @{<date>}
Date: Wed, 22 May 2013 16:09:55 +0530 [thread overview]
Message-ID: <1369219195-20096-3-git-send-email-artagnon@gmail.com> (raw)
In-Reply-To: <1369219195-20096-1-git-send-email-artagnon@gmail.com>
Currently, when we try to resolve @{<N>} or @{<date>} when the reflog
doesn't go back far enough, we get errors like:
# on branch master
$ git show @{10000}
fatal: Log for '' only has 7 entries.
$ git show @{10000.days.ago}
warning: Log for '' only goes back to Tue, 21 May 2013 14:14:45 +0530.
...
# detached HEAD case
$ git show @{10000}
fatal: Log for '' only has 2005 entries.
$ git show master@{10000}
fatal: Log for 'master' only has 7 entries.
The empty string '' is ugly, inconsistent, and failing to convey
information about whose logs we are inspecting. Change this so that we
get:
# on branch master
$ git show @{10000}
fatal: Log for 'master' only has 7 entries.
$ git show @{10000.days.ago}
warning: Log for 'master' only goes back to Tue, 21 May 2013 14:14:45 +0530.
...
# detached HEAD case
$ git show @{10000}
fatal: Log for 'HEAD' only has 2005 entries.
$ git show master@{10000}
fatal: Log for 'master' only has 7 entries.
Simple, consistent, and informative; suitable for output even from
plumbing commands like rev-parse.
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
---
sha1_name.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/sha1_name.c b/sha1_name.c
index 416a673..b7e008a 100644
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -517,6 +517,16 @@ 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,
--
1.8.3.rc3.10.g6f8d616
next prev parent reply other threads:[~2013-05-22 10:38 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-22 10:39 [PATCH v2 0/2] Fix invalid revision error messages Ramkumar Ramachandra
2013-05-22 10:39 ` [PATCH 1/2] sha1_name: fix error message for @{u} Ramkumar Ramachandra
2013-05-22 17:35 ` Junio C Hamano
2013-05-23 11:03 ` Ramkumar Ramachandra
2013-05-22 10:39 ` Ramkumar Ramachandra [this message]
2013-05-22 20:39 ` [PATCH 2/2] sha1_name: fix error message for @{<N>}, @{<date>} Eric Sunshine
-- strict thread matches above, loose matches on Subject: below --
2013-05-24 7:42 [PATCH v3 0/2] Replacement for rr/die-on-missing-upstream Ramkumar Ramachandra
2013-05-24 7:42 ` [PATCH 2/2] sha1_name: fix error message for @{<N>}, @{<date>} Ramkumar Ramachandra
2013-05-24 16:52 ` Junio C Hamano
2013-05-24 17:24 ` Ramkumar Ramachandra
2013-05-24 17:46 ` Junio C Hamano
2013-05-24 17:50 ` Ramkumar Ramachandra
2013-05-21 10:41 [PATCH 0/2] Fix invalid revision error messages for 1.8.3 Ramkumar Ramachandra
2013-05-21 10:41 ` [PATCH 2/2] sha1_name: fix error message for @{<N>}, @{<date>} Ramkumar Ramachandra
2013-05-21 16:52 ` Junio C Hamano
2013-05-21 17:38 ` Kevin Bracey
2013-05-21 18:09 ` Ramkumar Ramachandra
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1369219195-20096-3-git-send-email-artagnon@gmail.com \
--to=artagnon@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).