From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Subject: [PATCH 6/9] sha1_name.c: teach find_short_packed_object() a commit-only option
Date: Mon, 18 Jun 2012 15:05:36 -0700 [thread overview]
Message-ID: <1340057139-8311-8-git-send-email-gitster@pobox.com> (raw)
In-Reply-To: <1340057139-8311-1-git-send-email-gitster@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
sha1_name.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/sha1_name.c b/sha1_name.c
index a283c85..262d7e1 100644
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -97,6 +97,7 @@ static int unique_in_pack(int len,
const unsigned char *match,
struct packed_git *p,
const unsigned char **found_sha1,
+ int commit_only,
int seen_so_far)
{
uint32_t num, last, i, first = 0;
@@ -134,6 +135,8 @@ static int unique_in_pack(int len,
break;
/* current matches */
+ if (commit_only && !is_commit_object(current))
+ continue;
if (!seen_so_far) {
*found_sha1 = current;
seen_so_far++;
@@ -146,7 +149,8 @@ static int unique_in_pack(int len,
return seen_so_far;
}
-static int find_short_packed_object(int len, const unsigned char *match, unsigned char *sha1)
+static int find_short_packed_object(int len, const unsigned char *match,
+ unsigned char *sha1, int commit_only)
{
struct packed_git *p;
const unsigned char *found_sha1 = NULL;
@@ -154,7 +158,8 @@ static int find_short_packed_object(int len, const unsigned char *match, unsigne
prepare_packed_git();
for (p = packed_git; p && found < 2; p = p->next)
- found = unique_in_pack(len, match, p, &found_sha1, found);
+ found = unique_in_pack(len, match, p, &found_sha1,
+ commit_only, found);
if (found == 1)
hashcpy(sha1, found_sha1);
@@ -172,7 +177,7 @@ static int find_unique_short_object(int len, char *canonical,
prepare_alt_odb();
has_unpacked = find_short_object_filename(len, canonical, unpacked_sha1, 0);
- has_packed = find_short_packed_object(len, res, packed_sha1);
+ has_packed = find_short_packed_object(len, res, packed_sha1, 0);
if (!has_unpacked && !has_packed)
return SHORT_NAME_NOT_FOUND;
if (1 < has_unpacked || 1 < has_packed)
--
1.7.11
next prev parent reply other threads:[~2012-06-18 22:06 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-18 22:05 [PATCH 0/9] Extending the shelf life of "git describe" output Junio C Hamano
2012-06-18 22:05 ` [PATCH 1/9] sha1_name.c: indentation fix Junio C Hamano
2012-06-18 22:05 ` [PATCH 2/9] sha1_name.c: clarify what "fake" is for in find_short_object_filename() Junio C Hamano
2012-06-18 22:05 ` [PATCH 3/9] sha1_name.c: rename "now" to "current" Junio C Hamano
2012-06-18 22:05 ` [PATCH 4/9] sha1_name.c: refactor find_short_packed_object() Junio C Hamano
2012-06-18 22:05 ` [PATCH 5/9] sha1_name.c: teach find_short_object_filename() a commit-only option Junio C Hamano
2012-06-18 22:05 ` Junio C Hamano
2012-06-18 22:05 ` Junio C Hamano [this message]
2012-06-18 22:05 ` [PATCH 7/9] sha1_name.c: allow get_short_sha1() to take other flags Junio C Hamano
2012-06-18 22:05 ` [PATCH 8/9] sha1_name.c: teach get_short_sha1() a commit-only option Junio C Hamano
2012-06-18 22:05 ` [PATCH 9/9] sha1_name.c: get_describe_name() by definition groks only commits Junio C Hamano
2012-06-19 7:14 ` [PATCH 0/9] Extending the shelf life of "git describe" output Thomas Rast
2012-06-19 23:08 ` Junio C Hamano
2012-06-20 7:40 ` Thomas Rast
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=1340057139-8311-8-git-send-email-gitster@pobox.com \
--to=gitster@pobox.com \
--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).