From: Junio C Hamano <junkio@cox.net>
To: git@vger.kernel.org
Subject: [PATCH 1/3] dwim_ref(): Separate name-to-ref DWIM code out.
Date: Fri, 19 Jan 2007 15:51:05 -0800 [thread overview]
Message-ID: <7vtzymd192.fsf@assigned-by-dhcp.cox.net> (raw)
I'll be using this in another function to figure out what to
pass to resolve_ref().
Signed-off-by: Junio C Hamano <junkio@cox.net>
---
cache.h | 2 ++
sha1_name.c | 38 ++++++++++++++++++++++++--------------
2 files changed, 26 insertions(+), 14 deletions(-)
diff --git a/cache.h b/cache.h
index e6e19bd..a218db3 100644
--- a/cache.h
+++ b/cache.h
@@ -299,6 +299,8 @@ 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);
extern const char *resolve_ref(const char *path, unsigned char *sha1, int, int *);
+extern int dwim_ref(const char *str, int len, unsigned char *sha1, char **ref);
+
extern int create_symref(const char *ref, const char *refs_heads_master);
extern int validate_headref(const char *ref);
diff --git a/sha1_name.c b/sha1_name.c
index 6d7cd78..ae31851 100644
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -235,7 +235,7 @@ static int ambiguous_path(const char *path, int len)
return slash;
}
-static int get_sha1_basic(const char *str, int len, unsigned char *sha1)
+int dwim_ref(const char *str, int len, unsigned char *sha1, char **ref)
{
static const char *fmt[] = {
"%.*s",
@@ -246,13 +246,32 @@ static int get_sha1_basic(const char *str, int len, unsigned char *sha1)
"refs/remotes/%.*s/HEAD",
NULL
};
+ const char **p, *r;
+ int refs_found = 0;
+
+ *ref = NULL;
+ for (p = fmt; *p; p++) {
+ unsigned char sha1_from_ref[20];
+ unsigned char *this_result;
+
+ this_result = refs_found ? sha1_from_ref : sha1;
+ r = resolve_ref(mkpath(*p, len, str), this_result, 1, NULL);
+ if (r) {
+ if (!refs_found++)
+ *ref = xstrdup(r);
+ if (!warn_ambiguous_refs)
+ break;
+ }
+ }
+ return refs_found;
+}
+
+static int get_sha1_basic(const char *str, int len, unsigned char *sha1)
+{
static const char *warning = "warning: refname '%.*s' is ambiguous.\n";
- const char **p, *ref;
char *real_ref = NULL;
int refs_found = 0;
int at, reflog_len;
- unsigned char *this_result;
- unsigned char sha1_from_ref[20];
if (len == 40 && !get_sha1_hex(str, sha1))
return 0;
@@ -273,16 +292,7 @@ static int get_sha1_basic(const char *str, int len, unsigned char *sha1)
if (ambiguous_path(str, len))
return -1;
- for (p = fmt; *p; p++) {
- this_result = refs_found ? sha1_from_ref : sha1;
- ref = resolve_ref(mkpath(*p, len, str), this_result, 1, NULL);
- if (ref) {
- if (!refs_found++)
- real_ref = xstrdup(ref);
- if (!warn_ambiguous_refs)
- break;
- }
- }
+ refs_found = dwim_ref(str, len, sha1, &real_ref);
if (!refs_found)
return -1;
--
1.5.0.rc1.gcb48c
reply other threads:[~2007-01-19 23:51 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=7vtzymd192.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=git@vger.kernel.org \
/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).