From: Ramkumar Ramachandra <artagnon@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git List <git@vger.kernel.org>
Subject: [PATCH 2/2] sha1_name: fix error message for @{<N>}, @{<date>}
Date: Tue, 21 May 2013 16:11:55 +0530 [thread overview]
Message-ID: <1369132915-25657-3-git-send-email-artagnon@gmail.com> (raw)
In-Reply-To: <1369132915-25657-1-git-send-email-artagnon@gmail.com>
Currently, when we try to resolve @{<N>} or @{<date>} when the reflog
for the current branch doesn't go back far enough, we get errors like:
$ 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.
...
The empty string '' looks ugly and inconsistent with the output of
<branch>@{<N>}. Replace it with the string 'current branch'.
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
---
sha1_name.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/sha1_name.c b/sha1_name.c
index 416a673..683b4bd 100644
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -517,6 +517,10 @@ 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) {
+ str = "current branch";
+ len = strlen("current branch");
+ }
if (at_time)
warning("Log for '%.*s' only goes "
"back to %s.", len, str,
--
1.8.3.rc3.6.ga9126d5.dirty
next prev parent reply other threads:[~2013-05-21 10:40 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
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 1/2] sha1_name: fix error message for @{u} Ramkumar Ramachandra
2013-05-21 16:42 ` Junio C Hamano
2013-05-21 17:56 ` Ramkumar Ramachandra
2013-05-21 18:02 ` Junio C Hamano
2013-05-21 18:04 ` Ramkumar Ramachandra
2013-05-21 18:09 ` Junio C Hamano
2013-05-21 19:19 ` Ramkumar Ramachandra
2013-05-21 20:08 ` Junio C Hamano
2013-05-21 20:14 ` Ramkumar Ramachandra
2013-05-21 20:33 ` Junio C Hamano
2013-05-21 10:41 ` Ramkumar Ramachandra [this message]
2013-05-21 16:52 ` [PATCH 2/2] sha1_name: fix error message for @{<N>}, @{<date>} Junio C Hamano
2013-05-21 17:38 ` Kevin Bracey
2013-05-21 18:09 ` Ramkumar Ramachandra
2013-05-21 16:36 ` [PATCH 0/2] Fix invalid revision error messages for 1.8.3 Junio C Hamano
2013-05-21 17:50 ` Ramkumar Ramachandra
2013-05-21 17:57 ` Junio C Hamano
2013-05-21 18:16 ` Ramkumar Ramachandra
-- strict thread matches above, loose matches on Subject: below --
2013-05-22 10:39 [PATCH v2 0/2] Fix invalid revision error messages Ramkumar Ramachandra
2013-05-22 10:39 ` [PATCH 2/2] sha1_name: fix error message for @{<N>}, @{<date>} Ramkumar Ramachandra
2013-05-22 20:39 ` Eric Sunshine
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
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=1369132915-25657-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).