builtin/grep: convert to struct object_id

Convert several functions to use struct object_id, and rename them so
that they no longer refer to SHA-1.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/grep.c b/builtin/grep.c
index 2c727ef499c0fa7b44c0cf1890cc44427dc8921f..0393b0fdc47467ddf10acdd830b910b58a1accd7 100644 (file)
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -294,17 +294,17 @@ static int grep_cmd_config(const char *var, const char *value, void *cb)
        return st;
 }
 
        return st;
 }
 

-static void *lock_and_read_sha1_file(const unsigned char *sha1, enum object_type *type, unsigned long *size)
+static void *lock_and_read_oid_file(const struct object_id *oid, enum object_type *type, unsigned long *size)

 {
        void *data;
 
        grep_read_lock();
 {
        void *data;
 
        grep_read_lock();

-       data = read_sha1_file(sha1, type, size);
+       data = read_sha1_file(oid->hash, type, size);

        grep_read_unlock();
        return data;
 }
 
        grep_read_unlock();
        return data;
 }
 

-static int grep_sha1(struct grep_opt *opt, const unsigned char *sha1,
+static int grep_oid(struct grep_opt *opt, const struct object_id *oid,

                     const char *filename, int tree_name_len,
                     const char *path)
 {
                     const char *filename, int tree_name_len,
                     const char *path)
 {


@@ -323,7 +323,7 @@ static int grep_sha1(struct grep_opt *opt, const unsigned char *sha1,
 
 #ifndef NO_PTHREADS
        if (num_threads) {
 
 #ifndef NO_PTHREADS
        if (num_threads) {

-               add_work(opt, GREP_SOURCE_SHA1, pathbuf.buf, path, sha1);
+               add_work(opt, GREP_SOURCE_SHA1, pathbuf.buf, path, oid);

                strbuf_release(&pathbuf);
                return 0;
        } else
                strbuf_release(&pathbuf);
                return 0;
        } else


@@ -332,7 +332,7 @@ static int grep_sha1(struct grep_opt *opt, const unsigned char *sha1,
                struct grep_source gs;
                int hit;
 
                struct grep_source gs;
                int hit;
 

-               grep_source_init(&gs, GREP_SOURCE_SHA1, pathbuf.buf, path, sha1);
+               grep_source_init(&gs, GREP_SOURCE_SHA1, pathbuf.buf, path, oid);

                strbuf_release(&pathbuf);
                hit = grep_source(opt, &gs);
 
                strbuf_release(&pathbuf);
                hit = grep_source(opt, &gs);
 


@@ -690,7 +690,7 @@ static int grep_cache(struct grep_opt *opt, const struct pathspec *pathspec,
                            ce_skip_worktree(ce)) {
                                if (ce_stage(ce) || ce_intent_to_add(ce))
                                        continue;
                            ce_skip_worktree(ce)) {
                                if (ce_stage(ce) || ce_intent_to_add(ce))
                                        continue;

-                               hit |= grep_sha1(opt, ce->oid.hash, ce->name,
+                               hit |= grep_oid(opt, &ce->oid, ce->name,

                                                 0, ce->name);
                        } else {
                                hit |= grep_file(opt, ce->name);
                                                 0, ce->name);
                        } else {
                                hit |= grep_file(opt, ce->name);


@@ -750,7 +750,7 @@ static int grep_tree(struct grep_opt *opt, const struct pathspec *pathspec,
                strbuf_add(base, entry.path, te_len);
 
                if (S_ISREG(entry.mode)) {
                strbuf_add(base, entry.path, te_len);
 
                if (S_ISREG(entry.mode)) {

-                       hit |= grep_sha1(opt, entry.oid->hash, base->buf, tn_len,
+                       hit |= grep_oid(opt, entry.oid, base->buf, tn_len,

                                         check_attr ? base->buf + tn_len : NULL);
                } else if (S_ISDIR(entry.mode)) {
                        enum object_type type;
                                         check_attr ? base->buf + tn_len : NULL);
                } else if (S_ISDIR(entry.mode)) {
                        enum object_type type;


@@ -758,7 +758,7 @@ static int grep_tree(struct grep_opt *opt, const struct pathspec *pathspec,
                        void *data;
                        unsigned long size;
 
                        void *data;
                        unsigned long size;
 

-                       data = lock_and_read_sha1_file(entry.oid->hash, &type, &size);
+                       data = lock_and_read_oid_file(entry.oid, &type, &size);

                        if (!data)
                                die(_("unable to read tree (%s)"),
                                    oid_to_hex(entry.oid));
                        if (!data)
                                die(_("unable to read tree (%s)"),
                                    oid_to_hex(entry.oid));


@@ -787,7 +787,7 @@ static int grep_object(struct grep_opt *opt, const struct pathspec *pathspec,
                       struct object *obj, const char *name, const char *path)
 {
        if (obj->type == OBJ_BLOB)
                       struct object *obj, const char *name, const char *path)
 {
        if (obj->type == OBJ_BLOB)

-               return grep_sha1(opt, obj->oid.hash, name, 0, path);
+               return grep_oid(opt, &obj->oid, name, 0, path);

        if (obj->type == OBJ_COMMIT || obj->type == OBJ_TREE) {
                struct tree_desc tree;
                void *data;
        if (obj->type == OBJ_COMMIT || obj->type == OBJ_TREE) {
                struct tree_desc tree;
                void *data;


@@ -1152,11 +1152,11 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
        /* Check revs and then paths */
        for (i = 0; i < argc; i++) {
                const char *arg = argv[i];
        /* Check revs and then paths */
        for (i = 0; i < argc; i++) {
                const char *arg = argv[i];

-               unsigned char sha1[20];
+               struct object_id oid;

                struct object_context oc;
                /* Is it a rev? */
                struct object_context oc;
                /* Is it a rev? */

-               if (!get_sha1_with_context(arg, 0, sha1, &oc)) {
-                       struct object *object = parse_object_or_die(sha1, arg);
+               if (!get_sha1_with_context(arg, 0, oid.hash, &oc)) {
+                       struct object *object = parse_object_or_die(oid.hash, arg);

                        if (!seen_dashdash)
                                verify_non_filename(prefix, arg);
                        add_object_array_with_path(object, arg, &list, oc.mode, oc.path);
                        if (!seen_dashdash)
                                verify_non_filename(prefix, arg);
                        add_object_array_with_path(object, arg, &list, oc.mode, oc.path);