[PATCH v2 1/2] rev-parse: exit with non-zero status if ref@{n} is not valid.
From: Jon Seymour <hidden>
Date: 2016-06-15 22:49:22
Subsystem:
the rest · Maintainer:
Linus Torvalds
From Junio's e-mail:
"The current behaviour of ref@{...} syntax parser is suboptimal:
$ git rev-parse --verify jch@{99999} && echo true
warning: Log for 'jch' only has 1368 entries.
cfb88e9a8d4926b0011ae2dd67e1f57a98f4b768
true
It even knows that it is running off the cut-off point; it should just
cause the caller to notice that fact. I don't think changing it to error
out should cause any harm to existing callers."
With this change:
$ git rev-parse --verify jch@{99999} || echo false
fatal: Log for 'jch' only has 1368 entries.
false
$ git rev-parse jch@{99999} || echo false
fatal: Log for 'jch' only has 1368 entries.
false
Signed-off-by: Jon Seymour <redacted>
---
sha1_name.c | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/sha1_name.c b/sha1_name.c
index 4af94fa..d40ae48 100644
--- a/sha1_name.c
+++ b/sha1_name.c@@ -342,7 +342,7 @@ static int get_sha1_1(const char *name, int len, unsigned char *sha1); static int get_sha1_basic(const char *str, int len, unsigned char *sha1) { - static const char *warning = "warning: refname '%.*s' is ambiguous.\n"; + static const char *warn_msg = "warning: refname '%.*s' is ambiguous."; char *real_ref = NULL; int refs_found = 0; int at, reflog_len;
@@ -390,7 +390,7 @@ static int get_sha1_basic(const char *str, int len, unsigned char *sha1) return -1; if (warn_ambiguous_refs && refs_found > 1) - fprintf(stderr, warning, len, str); + fprintf(stderr, warn_msg, len, str); if (reflog_len) { int nth, i;
@@ -426,14 +426,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 (at_time) - fprintf(stderr, - "warning: Log for '%.*s' only goes " - "back to %s.\n", len, str, + warning("Log for '%.*s' only goes " + "back to %s.", len, str, show_date(co_time, co_tz, DATE_RFC2822)); - else - fprintf(stderr, - "warning: Log for '%.*s' only has " - "%d entries.\n", len, str, co_cnt); + else { + free(real_ref); + die("Log for '%.*s' only has %d entries.", + len, + str, + co_cnt); + } } }
--
1.7.2.1.99.geab11