From: Jon Seymour <jon.seymour@gmail.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com, Jon Seymour <jon.seymour@gmail.com>
Subject: [PATCH 3/4] rev-parse: introduce get_sha1_gently
Date: Sat, 21 Aug 2010 11:43:41 +1000 [thread overview]
Message-ID: <1282355022-17795-4-git-send-email-jon.seymour@gmail.com> (raw)
In-Reply-To: <AANLkTi=m7+h0nVg+EAmiir-rnrjoBwbpLtztcNNBVxiz@mail.gmail.com>
Use of this function allows git rev-parse --verify ref@{n}
to report an error message if n >= the size of the
reference log for ref.
However, if the user has not specified --verify, get_sha1_gently
will be called again via verify_filename and the message will
be reported then, if required.
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
---
builtin/rev-parse.c | 2 +-
cache.h | 1 +
sha1_name.c | 8 ++++++++
3 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c
index a5a1c86..dbc6a8c 100644
--- a/builtin/rev-parse.c
+++ b/builtin/rev-parse.c
@@ -707,7 +707,7 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix)
name++;
type = REVERSED;
}
- if (!get_sha1(name, sha1)) {
+ if (!get_sha1_gently(name, sha1, !verify)) {
if (verify)
revs_count++;
else
diff --git a/cache.h b/cache.h
index 37ef9d8..625728c 100644
--- a/cache.h
+++ b/cache.h
@@ -767,6 +767,7 @@ static inline int get_sha1_with_context(const char *str, unsigned char *sha1, st
{
return get_sha1_with_context_1(str, sha1, orc, 1, NULL);
}
+extern inline int get_sha1_gently(const char *str, unsigned char *sha1, int gently);
extern int get_sha1_hex(const char *hex, unsigned char *sha1);
extern char *sha1_to_hex(const unsigned char *sha1); /* static buffer result! */
extern int read_ref(const char *filename, unsigned char *sha1);
diff --git a/sha1_name.c b/sha1_name.c
index 6e706eb..48e7aa0 100644
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -1050,6 +1050,14 @@ int get_sha1_with_mode_1(const char *name, unsigned char *sha1, unsigned *mode,
return ret;
}
+int get_sha1_gently(const char *name, unsigned char *sha1, int gently)
+{
+ struct object_context unused;
+ int ret;
+ ret = get_sha1_with_context_1(name, sha1, &unused, gently, NULL);
+ return ret;
+}
+
int get_sha1_with_context_1(const char *name, unsigned char *sha1,
struct object_context *oc,
int gently, const char *prefix)
--
1.7.2.1.156.gf148c
next prev parent reply other threads:[~2010-08-21 1:44 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-18 11:36 RFD: should git rev-parse exit with non-zero status if ref@{n} is not valid? Jon Seymour
2010-08-18 11:41 ` Jon Seymour
2010-08-18 20:50 ` Junio C Hamano
2010-08-18 23:02 ` Jon Seymour
2010-08-21 1:43 ` [PATCH 0/4] rev-parse: improve reporting of invalid log references Jon Seymour
2010-08-21 1:43 ` [PATCH 1/4] rev-parse: exit with non-zero status if ref@{n} is not valid Jon Seymour
2010-08-21 1:43 ` [PATCH 2/4] rev-parse: suppress duplicate log limit exceeded message Jon Seymour
2010-08-22 21:20 ` Junio C Hamano
2010-08-23 14:59 ` Jon Seymour
2010-08-23 16:33 ` Junio C Hamano
2010-08-23 23:11 ` [PATCH v2 0/2] rev-parse: strengthen validation of ref@{n} references Jon Seymour
2010-08-23 23:11 ` [PATCH v2 1/2] rev-parse: exit with non-zero status if ref@{n} is not valid Jon Seymour
2010-08-24 0:14 ` Jonathan Nieder
2010-08-24 4:52 ` [PATCH v3 0/3] rev-parse: strengthen validation of ref@{n} references Jon Seymour
2010-08-24 4:52 ` [PATCH v3 1/3] rev-parse: exit with non-zero status if ref@{n} is not valid Jon Seymour
2010-08-24 4:52 ` [PATCH v3 2/3] sha1_name.c: use warning in preference to fprintf(stderr Jon Seymour
2010-08-24 4:52 ` [PATCH v3 3/3] rev-parse: tests git rev-parse --verify master@{n}, for various n Jon Seymour
2010-08-23 23:11 ` [PATCH v2 2/2] " Jon Seymour
2010-08-21 1:43 ` Jon Seymour [this message]
2010-08-21 1:43 ` [PATCH 4/4] rev-parse: tests that git rev-parse --verify master@{n} Jon Seymour
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1282355022-17795-4-git-send-email-jon.seymour@gmail.com \
--to=jon.seymour@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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).