git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Steffen Prohaska <prohaska@zib.de>
To: git@vger.kernel.org
Cc: Steffen Prohaska <prohaska@zib.de>
Subject: [PATCH 6/8] add ref_cmp_full_short() comparing full ref name with a short name
Date: Sat, 27 Oct 2007 18:50:05 +0200	[thread overview]
Message-ID: <11935038084130-git-send-email-prohaska@zib.de> (raw)
In-Reply-To: <11935038084055-git-send-email-prohaska@zib.de>

ref_cmp_full_short(full_name, short_name) expands short_name according
to the rules documented in git-rev-parse and compares the expanded
name with full_name. It reports a match by returning 0.

This function makes the rules for resolving refs to sha1s available
for string comparison. Before this change, the rules were buried in
get_sha1*() and dwim_ref().

ref_cmp_full_short() will be used for matching refspecs in git-send-pack.

Signed-off-by: Steffen Prohaska <prohaska@zib.de>
---
 cache.h     |    1 +
 sha1_name.c |   14 ++++++++++++++
 2 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/cache.h b/cache.h
index 726948b..e1385ac 100644
--- a/cache.h
+++ b/cache.h
@@ -406,6 +406,7 @@ 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 ref_cmp_full_short(const char *full_name, const char *short_name);
 extern int dwim_ref(const char *str, int len, unsigned char *sha1, char **ref);
 extern int dwim_log(const char *str, int len, unsigned char *sha1, char **ref);
 
diff --git a/sha1_name.c b/sha1_name.c
index b820909..2a1e093 100644
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -249,6 +249,20 @@ static const char *ref_fmt[] = {
 	NULL
 };
 
+int ref_cmp_full_short(const char *full_name, const char *short_name)
+{
+	const char **p;
+	const int short_name_len = strlen(short_name);
+
+	for (p = ref_fmt; *p; p++) {
+		if (strcmp(full_name, mkpath(*p, short_name_len, short_name)) == 0) {
+			return 0;
+		}
+	}
+
+	return -1;
+}
+
 int dwim_ref(const char *str, int len, unsigned char *sha1, char **ref)
 {
 	const char **p, *r;
-- 
1.5.3.4.1261.g626eb

  reply	other threads:[~2007-10-27 16:51 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-10-27 16:49 [PATCH 0/8 v2] improve push's refspec handling Steffen Prohaska
2007-10-27 16:50 ` [PATCH 1/8] push: change push to fail if short ref name does not exist Steffen Prohaska
2007-10-27 16:50   ` [PATCH 2/8] push: teach push new flag --create Steffen Prohaska
2007-10-27 16:50     ` [PATCH 3/8] add get_sha1_with_real_ref() returning full name of ref on demand Steffen Prohaska
2007-10-27 16:50       ` [PATCH 4/8] rev-parse: teach "git rev-parse --symbolic" to print the full ref name Steffen Prohaska
2007-10-27 16:50         ` [PATCH 5/8] push, send-pack: support pushing HEAD to real " Steffen Prohaska
2007-10-27 16:50           ` Steffen Prohaska [this message]
2007-10-27 16:50             ` [PATCH 7/8] push: use same rules as git-rev-parse to resolve refspecs Steffen Prohaska
2007-10-27 16:50               ` [PATCH 8/8] push: teach push to be quiet if local ref is strict subset of remote ref Steffen Prohaska
2007-10-28  7:28                 ` Junio C Hamano
2007-10-28  8:20                   ` Steffen Prohaska
2007-10-28  7:28               ` [PATCH 7/8] push: use same rules as git-rev-parse to resolve refspecs Junio C Hamano
2007-10-27 22:16             ` [PATCH 6/8] add ref_cmp_full_short() comparing full ref name with a short name Daniel Barkalow
2007-10-28  7:28             ` Junio C Hamano
2007-10-27 22:03           ` [PATCH 5/8] push, send-pack: support pushing HEAD to real ref name Daniel Barkalow
2007-10-28  7:28           ` Junio C Hamano
2007-10-28  8:03             ` Steffen Prohaska
2007-10-28 15:10             ` Steffen Prohaska
2007-10-28 15:40               ` Junio C Hamano
2007-10-28 15:59                 ` Steffen Prohaska
2007-10-28 16:03                 ` Junio C Hamano
2007-10-28 16:30                   ` Steffen Prohaska
2007-10-28 20:58                     ` Junio C Hamano
2007-10-31 15:08                       ` Steffen Prohaska
2007-10-27 21:53         ` [PATCH 4/8] rev-parse: teach "git rev-parse --symbolic" to print the full " Daniel Barkalow
2007-10-28 13:49           ` Steffen Prohaska
2007-10-28  7:28         ` Junio C Hamano
2007-10-28  7:58           ` Steffen Prohaska
2007-10-28  8:06             ` Shawn O. Pearce
2007-10-28  8:56               ` Steffen Prohaska
2007-10-28 15:10                 ` Brian Gernhardt
2007-10-28  8:24             ` Junio C Hamano
2007-10-28  7:28       ` [PATCH 3/8] add get_sha1_with_real_ref() returning full name of ref on demand Junio C Hamano
2007-10-27 21:42   ` [PATCH 1/8] push: change push to fail if short ref name does not exist Daniel Barkalow
2007-10-28  7:28   ` Junio C Hamano
2007-10-28  8:43     ` Steffen Prohaska

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=11935038084130-git-send-email-prohaska@zib.de \
    --to=prohaska@zib.de \
    --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.
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).