git-rev-list: Add regexp tuning options

[thirdparty/git.git] / sha1_name.c

diff --git a/sha1_name.c b/sha1_name.c
index 267ea3f3edc63600bc1591d2115ee85222f3e8c5..55f25a2d3b49b1d565a9840b7dcfb2e22687cdd3 100644 (file)
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -76,7 +76,7 @@ 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) {
-               uint32_t num = num_packed_objects(p);
+               uint32_t num = p->num_objects;
                uint32_t first = 0, last = num;
                while (first < last) {
                        uint32_t mid = (first + last) / 2;
@@ -643,11 +643,17 @@ static int get_sha1_oneline(const char *prefix, unsigned char *sha1)
  */
 int get_sha1(const char *name, unsigned char *sha1)
 {
-       int ret, bracket_depth;
        unsigned unused;
+       return get_sha1_with_mode(name, sha1, &unused);
+}
+
+int get_sha1_with_mode(const char *name, unsigned char *sha1, unsigned *mode)
+{
+       int ret, bracket_depth;
        int namelen = strlen(name);
        const char *cp;
 
+       *mode = S_IFINVALID;
        prepare_alt_odb();
        ret = get_sha1_1(name, namelen, sha1);
        if (!ret)
@@ -685,6 +691,7 @@ int get_sha1(const char *name, unsigned char *sha1)
                                break;
                        if (ce_stage(ce) == stage) {
                                hashcpy(sha1, ce->sha1);
+                               *mode = ntohl(ce->ce_mode);
                                return 0;
                        }
                        pos++;
@@ -703,7 +710,7 @@ int get_sha1(const char *name, unsigned char *sha1)
                unsigned char tree_sha1[20];
                if (!get_sha1_1(name, cp-name, tree_sha1))
                        return get_tree_entry(tree_sha1, cp+1, sha1,
-                                             &unused);
+                                             mode);
        }
        return ret;
 }