sha1_name: convert GET_SHA1* flags to GET_OID*

Convert the flags for get_oid_with_context and friends to use "OID"
instead of "SHA1" in their names.

This transform was made by running the following one-liner on the
affected files:

perl -pi -e 's/GET_SHA1/GET_OID/g'

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

diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index 1f035fb55008822d08d5633b154a54a02f8c2191..62c8cf0ebf3f2ba063945fc44714a9da29b599ef 100644 (file)
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -63,7 +63,7 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name,
        if (unknown_type)
                flags |= OBJECT_INFO_ALLOW_UNKNOWN_TYPE;
 
        if (unknown_type)
                flags |= OBJECT_INFO_ALLOW_UNKNOWN_TYPE;
 

-       if (get_oid_with_context(obj_name, GET_SHA1_RECORD_PATH,
+       if (get_oid_with_context(obj_name, GET_OID_RECORD_PATH,

                                 &oid, &obj_context))
                die("Not a valid object name %s", obj_name);
 
                                 &oid, &obj_context))
                die("Not a valid object name %s", obj_name);
 


@@ -361,7 +361,7 @@ static void batch_one_object(const char *obj_name, struct batch_options *opt,
                             struct expand_data *data)
 {
        struct object_context ctx;
                             struct expand_data *data)
 {
        struct object_context ctx;

-       int flags = opt->follow_symlinks ? GET_SHA1_FOLLOW_SYMLINKS : 0;
+       int flags = opt->follow_symlinks ? GET_OID_FOLLOW_SYMLINKS : 0;

        enum follow_symlinks_result result;
 
        result = get_oid_with_context(obj_name, flags, &data->oid, &ctx);
        enum follow_symlinks_result result;
 
        result = get_oid_with_context(obj_name, flags, &data->oid, &ctx);

diff --git a/builtin/grep.c b/builtin/grep.c
index f339567e66f365034c608e17d35f1a55d3930bca..9124450163ebf71eec82ee466b155fc2a749d93e 100644 (file)
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -1207,7 +1207,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
                        break;
                }
 
                        break;
                }
 

-               if (get_oid_with_context(arg, GET_SHA1_RECORD_PATH,
+               if (get_oid_with_context(arg, GET_OID_RECORD_PATH,

                                         &oid, &oc)) {
                        if (seen_dashdash)
                                die(_("unable to resolve revision: %s"), arg);
                                         &oid, &oc)) {
                        if (seen_dashdash)
                                die(_("unable to resolve revision: %s"), arg);

diff --git a/builtin/log.c b/builtin/log.c
index 413b760771a1e8378eb51f3bc399090d5f0eda81..cb7e0e61d722e3ff5fb66528e4e7496c1d3c5680 100644 (file)
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -484,7 +484,7 @@ static int show_blob_object(const struct object_id *oid, struct rev_info *rev, c
            !DIFF_OPT_TST(&rev->diffopt, ALLOW_TEXTCONV))
                return stream_blob_to_fd(1, oid, NULL, 0);
 
            !DIFF_OPT_TST(&rev->diffopt, ALLOW_TEXTCONV))
                return stream_blob_to_fd(1, oid, NULL, 0);
 

-       if (get_oid_with_context(obj_name, GET_SHA1_RECORD_PATH,
+       if (get_oid_with_context(obj_name, GET_OID_RECORD_PATH,

                                 &oidc, &obj_context))
                die(_("Not a valid object name %s"), obj_name);
        if (!obj_context.path ||
                                 &oidc, &obj_context))
                die(_("Not a valid object name %s"), obj_name);
        if (!obj_context.path ||

diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c
index 041b7898c4a47cb8ca4f61b1f3ebdc87152e72e9..2bd28d3c085c9f7f86072bb7e1aae443aee745e6 100644 (file)
--- a/builtin/rev-parse.c
+++ b/builtin/rev-parse.c
@@ -702,7 +702,7 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix)
                        }
                        if (!strcmp(arg, "--quiet") || !strcmp(arg, "-q")) {
                                quiet = 1;
                        }
                        if (!strcmp(arg, "--quiet") || !strcmp(arg, "-q")) {
                                quiet = 1;

-                               flags |= GET_SHA1_QUIETLY;
+                               flags |= GET_OID_QUIETLY;

                                continue;
                        }
                        if (opt_with_value(arg, "--short", &arg)) {
                                continue;
                        }
                        if (opt_with_value(arg, "--short", &arg)) {

diff --git a/cache.h b/cache.h
index da7ac495ba0eddf9c29fac13241a757bfff85a41..cfc3698ebacb8f4961356609e94c64c8306e98cd 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -1283,27 +1283,27 @@ struct object_context {
         */
        struct strbuf symlink_path;
        /*
         */
        struct strbuf symlink_path;
        /*

-        * If GET_SHA1_RECORD_PATH is set, this will record path (if any)
+        * If GET_OID_RECORD_PATH is set, this will record path (if any)

         * found when resolving the name. The caller is responsible for
         * releasing the memory.
         */
        char *path;
 };
 
         * found when resolving the name. The caller is responsible for
         * releasing the memory.
         */
        char *path;
 };
 

-#define GET_SHA1_QUIETLY           01
-#define GET_SHA1_COMMIT            02
-#define GET_SHA1_COMMITTISH        04
-#define GET_SHA1_TREE             010
-#define GET_SHA1_TREEISH          020
-#define GET_SHA1_BLOB             040
-#define GET_SHA1_FOLLOW_SYMLINKS 0100
-#define GET_SHA1_RECORD_PATH     0200
-#define GET_SHA1_ONLY_TO_DIE    04000
-
-#define GET_SHA1_DISAMBIGUATORS \
-       (GET_SHA1_COMMIT | GET_SHA1_COMMITTISH | \
-       GET_SHA1_TREE | GET_SHA1_TREEISH | \
-       GET_SHA1_BLOB)
+#define GET_OID_QUIETLY           01
+#define GET_OID_COMMIT            02
+#define GET_OID_COMMITTISH        04
+#define GET_OID_TREE             010
+#define GET_OID_TREEISH          020
+#define GET_OID_BLOB             040
+#define GET_OID_FOLLOW_SYMLINKS 0100
+#define GET_OID_RECORD_PATH     0200
+#define GET_OID_ONLY_TO_DIE    04000
+
+#define GET_OID_DISAMBIGUATORS \
+       (GET_OID_COMMIT | GET_OID_COMMITTISH | \
+       GET_OID_TREE | GET_OID_TREEISH | \
+       GET_OID_BLOB)

 
 extern int get_oid(const char *str, struct object_id *oid);
 extern int get_oid_commit(const char *str, struct object_id *oid);
 
 extern int get_oid(const char *str, struct object_id *oid);
 extern int get_oid_commit(const char *str, struct object_id *oid);

diff --git a/refs.c b/refs.c
index 7aae78cb551fd2743982d7f9fc60e6de45df9a11..e1de9251557d6e49d1ce846b1b31b080f0b320d6 100644 (file)
--- a/refs.c
+++ b/refs.c
@@ -818,7 +818,7 @@ int read_ref_at(const char *refname, unsigned int flags, timestamp_t at_time, in
        for_each_reflog_ent_reverse(refname, read_ref_at_ent, &cb);
 
        if (!cb.reccnt) {
        for_each_reflog_ent_reverse(refname, read_ref_at_ent, &cb);
 
        if (!cb.reccnt) {

-               if (flags & GET_SHA1_QUIETLY)
+               if (flags & GET_OID_QUIETLY)

                        exit(128);
                else
                        die("Log for %s is empty.", refname);
                        exit(128);
                else
                        die("Log for %s is empty.", refname);

diff --git a/revision.c b/revision.c
index 34bc81adf46aa8e909f1a6e2307266ae06ba375e..913ef8ce32ad8e6b747eb61bb79de68ffc8e9fc3 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -1453,7 +1453,7 @@ static int handle_dotdot_1(const char *arg, char *dotdot,
        unsigned int a_flags, b_flags;
        int symmetric = 0;
        unsigned int flags_exclude = flags ^ (UNINTERESTING | BOTTOM);
        unsigned int a_flags, b_flags;
        int symmetric = 0;
        unsigned int flags_exclude = flags ^ (UNINTERESTING | BOTTOM);

-       unsigned int oc_flags = GET_SHA1_COMMITTISH | GET_SHA1_RECORD_PATH;
+       unsigned int oc_flags = GET_OID_COMMITTISH | GET_OID_RECORD_PATH;

 
        a_name = arg;
        if (!*a_name)
 
        a_name = arg;
        if (!*a_name)


@@ -1549,7 +1549,7 @@ int handle_revision_arg(const char *arg_, struct rev_info *revs, int flags, unsi
        int local_flags;
        const char *arg = arg_;
        int cant_be_filename = revarg_opt & REVARG_CANNOT_BE_FILENAME;
        int local_flags;
        const char *arg = arg_;
        int cant_be_filename = revarg_opt & REVARG_CANNOT_BE_FILENAME;

-       unsigned get_sha1_flags = GET_SHA1_RECORD_PATH;
+       unsigned get_sha1_flags = GET_OID_RECORD_PATH;

 
        flags = flags & UNINTERESTING ? flags | BOTTOM : flags & ~BOTTOM;
 
 
        flags = flags & UNINTERESTING ? flags | BOTTOM : flags & ~BOTTOM;
 


@@ -1600,7 +1600,7 @@ int handle_revision_arg(const char *arg_, struct rev_info *revs, int flags, unsi
        }
 
        if (revarg_opt & REVARG_COMMITTISH)
        }
 
        if (revarg_opt & REVARG_COMMITTISH)

-               get_sha1_flags |= GET_SHA1_COMMITTISH;
+               get_sha1_flags |= GET_OID_COMMITTISH;

 
        if (get_oid_with_context(arg, get_sha1_flags, &oid, &oc))
                return revs->ignore_missing ? 0 : -1;
 
        if (get_oid_with_context(arg, get_sha1_flags, &oid, &oc))
                return revs->ignore_missing ? 0 : -1;

diff --git a/sha1_name.c b/sha1_name.c
index c92e51f4d9698d5f59df6a17dc35bc7ac57dfcac..7577eaecfa382036c0ac0c1593a2f63388854564 100644 (file)
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -390,23 +390,23 @@ static int get_short_oid(const char *name, int len, struct object_id *oid,
 {
        int status;
        struct disambiguate_state ds;
 {
        int status;
        struct disambiguate_state ds;

-       int quietly = !!(flags & GET_SHA1_QUIETLY);
+       int quietly = !!(flags & GET_OID_QUIETLY);

 
        if (init_object_disambiguation(name, len, &ds) < 0)
                return -1;
 
 
        if (init_object_disambiguation(name, len, &ds) < 0)
                return -1;
 

-       if (HAS_MULTI_BITS(flags & GET_SHA1_DISAMBIGUATORS))
+       if (HAS_MULTI_BITS(flags & GET_OID_DISAMBIGUATORS))

                die("BUG: multiple get_short_oid disambiguator flags");
 
                die("BUG: multiple get_short_oid disambiguator flags");
 

-       if (flags & GET_SHA1_COMMIT)
+       if (flags & GET_OID_COMMIT)

                ds.fn = disambiguate_commit_only;
                ds.fn = disambiguate_commit_only;

-       else if (flags & GET_SHA1_COMMITTISH)
+       else if (flags & GET_OID_COMMITTISH)

                ds.fn = disambiguate_committish_only;
                ds.fn = disambiguate_committish_only;

-       else if (flags & GET_SHA1_TREE)
+       else if (flags & GET_OID_TREE)

                ds.fn = disambiguate_tree_only;
                ds.fn = disambiguate_tree_only;

-       else if (flags & GET_SHA1_TREEISH)
+       else if (flags & GET_OID_TREEISH)

                ds.fn = disambiguate_treeish_only;
                ds.fn = disambiguate_treeish_only;

-       else if (flags & GET_SHA1_BLOB)
+       else if (flags & GET_OID_BLOB)

                ds.fn = disambiguate_blob_only;
        else
                ds.fn = default_disambiguate_hint;
                ds.fn = disambiguate_blob_only;
        else
                ds.fn = default_disambiguate_hint;


@@ -505,7 +505,7 @@ int find_unique_abbrev_r(char *hex, const unsigned char *sha1, int len)
        exists = has_sha1_file(sha1);
        while (len < 40) {
                struct object_id oid_ret;
        exists = has_sha1_file(sha1);
        while (len < 40) {
                struct object_id oid_ret;

-               status = get_short_oid(hex, len, &oid_ret, GET_SHA1_QUIETLY);
+               status = get_short_oid(hex, len, &oid_ret, GET_OID_QUIETLY);

                if (exists
                    ? !status
                    : status == SHORT_NAME_NOT_FOUND) {
                if (exists
                    ? !status
                    : status == SHORT_NAME_NOT_FOUND) {


@@ -662,9 +662,9 @@ static int get_oid_basic(const char *str, int len, struct object_id *oid,
        if (!refs_found)
                return -1;
 
        if (!refs_found)
                return -1;
 

-       if (warn_ambiguous_refs && !(flags & GET_SHA1_QUIETLY) &&
+       if (warn_ambiguous_refs && !(flags & GET_OID_QUIETLY) &&

            (refs_found > 1 ||
            (refs_found > 1 ||

-            !get_short_oid(str, len, &tmp_oid, GET_SHA1_QUIETLY)))
+            !get_short_oid(str, len, &tmp_oid, GET_OID_QUIETLY)))

                warning(warn_msg, len, str);
 
        if (reflog_len) {
                warning(warn_msg, len, str);
 
        if (reflog_len) {


@@ -709,13 +709,13 @@ static int get_oid_basic(const char *str, int len, struct object_id *oid,
                                }
                        }
                        if (at_time) {
                                }
                        }
                        if (at_time) {

-                               if (!(flags & GET_SHA1_QUIETLY)) {
+                               if (!(flags & GET_OID_QUIETLY)) {

                                        warning("Log for '%.*s' only goes "
                                                "back to %s.", len, str,
                                                show_date(co_time, co_tz, DATE_MODE(RFC2822)));
                                }
                        } else {
                                        warning("Log for '%.*s' only goes "
                                                "back to %s.", len, str,
                                                show_date(co_time, co_tz, DATE_MODE(RFC2822)));
                                }
                        } else {

-                               if (flags & GET_SHA1_QUIETLY) {
+                               if (flags & GET_OID_QUIETLY) {

                                        exit(128);
                                }
                                die("Log for '%.*s' only has %d entries.",
                                        exit(128);
                                }
                                die("Log for '%.*s' only has %d entries.",


@@ -732,7 +732,7 @@ static int get_parent(const char *name, int len,
                      struct object_id *result, int idx)
 {
        struct object_id oid;
                      struct object_id *result, int idx)
 {
        struct object_id oid;

-       int ret = get_oid_1(name, len, &oid, GET_SHA1_COMMITTISH);
+       int ret = get_oid_1(name, len, &oid, GET_OID_COMMITTISH);

        struct commit *commit;
        struct commit_list *p;
 
        struct commit *commit;
        struct commit_list *p;
 


@@ -763,7 +763,7 @@ static int get_nth_ancestor(const char *name, int len,
        struct commit *commit;
        int ret;
 
        struct commit *commit;
        int ret;
 

-       ret = get_oid_1(name, len, &oid, GET_SHA1_COMMITTISH);
+       ret = get_oid_1(name, len, &oid, GET_OID_COMMITTISH);

        if (ret)
                return ret;
        commit = lookup_commit_reference(&oid);
        if (ret)
                return ret;
        commit = lookup_commit_reference(&oid);


@@ -849,11 +849,11 @@ static int peel_onion(const char *name, int len, struct object_id *oid,
        else
                return -1;
 
        else
                return -1;
 

-       lookup_flags &= ~GET_SHA1_DISAMBIGUATORS;
+       lookup_flags &= ~GET_OID_DISAMBIGUATORS;

        if (expected_type == OBJ_COMMIT)
        if (expected_type == OBJ_COMMIT)

-               lookup_flags |= GET_SHA1_COMMITTISH;
+               lookup_flags |= GET_OID_COMMITTISH;

        else if (expected_type == OBJ_TREE)
        else if (expected_type == OBJ_TREE)

-               lookup_flags |= GET_SHA1_TREEISH;
+               lookup_flags |= GET_OID_TREEISH;

 
        if (get_oid_1(name, sp - name - 2, &outer, lookup_flags))
                return -1;
 
        if (get_oid_1(name, sp - name - 2, &outer, lookup_flags))
                return -1;


@@ -904,7 +904,7 @@ static int peel_onion(const char *name, int len, struct object_id *oid,
 static int get_describe_name(const char *name, int len, struct object_id *oid)
 {
        const char *cp;
 static int get_describe_name(const char *name, int len, struct object_id *oid)
 {
        const char *cp;

-       unsigned flags = GET_SHA1_QUIETLY | GET_SHA1_COMMIT;
+       unsigned flags = GET_OID_QUIETLY | GET_OID_COMMIT;

 
        for (cp = name + len - 1; name + 2 <= cp; cp--) {
                char ch = *cp;
 
        for (cp = name + len - 1; name + 2 <= cp; cp--) {
                char ch = *cp;


@@ -1361,35 +1361,35 @@ int get_oid(const char *name, struct object_id *oid)
 int get_oid_committish(const char *name, struct object_id *oid)
 {
        struct object_context unused;
 int get_oid_committish(const char *name, struct object_id *oid)
 {
        struct object_context unused;

-       return get_oid_with_context(name, GET_SHA1_COMMITTISH,
+       return get_oid_with_context(name, GET_OID_COMMITTISH,

                                    oid, &unused);
 }
 
 int get_oid_treeish(const char *name, struct object_id *oid)
 {
        struct object_context unused;
                                    oid, &unused);
 }
 
 int get_oid_treeish(const char *name, struct object_id *oid)
 {
        struct object_context unused;

-       return get_oid_with_context(name, GET_SHA1_TREEISH,
+       return get_oid_with_context(name, GET_OID_TREEISH,

                                    oid, &unused);
 }
 
 int get_oid_commit(const char *name, struct object_id *oid)
 {
        struct object_context unused;
                                    oid, &unused);
 }
 
 int get_oid_commit(const char *name, struct object_id *oid)
 {
        struct object_context unused;

-       return get_oid_with_context(name, GET_SHA1_COMMIT,
+       return get_oid_with_context(name, GET_OID_COMMIT,

                                    oid, &unused);
 }
 
 int get_oid_tree(const char *name, struct object_id *oid)
 {
        struct object_context unused;
                                    oid, &unused);
 }
 
 int get_oid_tree(const char *name, struct object_id *oid)
 {
        struct object_context unused;

-       return get_oid_with_context(name, GET_SHA1_TREE,
+       return get_oid_with_context(name, GET_OID_TREE,

                                    oid, &unused);
 }
 
 int get_oid_blob(const char *name, struct object_id *oid)
 {
        struct object_context unused;
                                    oid, &unused);
 }
 
 int get_oid_blob(const char *name, struct object_id *oid)
 {
        struct object_context unused;

-       return get_oid_with_context(name, GET_SHA1_BLOB,
+       return get_oid_with_context(name, GET_OID_BLOB,

                                    oid, &unused);
 }
 
                                    oid, &unused);
 }
 


@@ -1505,10 +1505,10 @@ static int get_oid_with_context_1(const char *name,
        int ret, bracket_depth;
        int namelen = strlen(name);
        const char *cp;
        int ret, bracket_depth;
        int namelen = strlen(name);
        const char *cp;

-       int only_to_die = flags & GET_SHA1_ONLY_TO_DIE;
+       int only_to_die = flags & GET_OID_ONLY_TO_DIE;

 
        if (only_to_die)
 
        if (only_to_die)

-               flags |= GET_SHA1_QUIETLY;
+               flags |= GET_OID_QUIETLY;

 
        memset(oc, 0, sizeof(*oc));
        oc->mode = S_IFINVALID;
 
        memset(oc, 0, sizeof(*oc));
        oc->mode = S_IFINVALID;


@@ -1551,7 +1551,7 @@ static int get_oid_with_context_1(const char *name,
                        namelen = strlen(cp);
                }
 
                        namelen = strlen(cp);
                }
 

-               if (flags & GET_SHA1_RECORD_PATH)
+               if (flags & GET_OID_RECORD_PATH)

                        oc->path = xstrdup(cp);
 
                if (!active_cache)
                        oc->path = xstrdup(cp);
 
                if (!active_cache)


@@ -1590,8 +1590,8 @@ static int get_oid_with_context_1(const char *name,
                int len = cp - name;
                unsigned sub_flags = flags;
 
                int len = cp - name;
                unsigned sub_flags = flags;
 

-               sub_flags &= ~GET_SHA1_DISAMBIGUATORS;
-               sub_flags |= GET_SHA1_TREEISH;
+               sub_flags &= ~GET_OID_DISAMBIGUATORS;
+               sub_flags |= GET_OID_TREEISH;

 
                if (!get_oid_1(name, len, &tree_oid, sub_flags)) {
                        const char *filename = cp+1;
 
                if (!get_oid_1(name, len, &tree_oid, sub_flags)) {
                        const char *filename = cp+1;


@@ -1600,7 +1600,7 @@ static int get_oid_with_context_1(const char *name,
                        new_filename = resolve_relative_path(filename);
                        if (new_filename)
                                filename = new_filename;
                        new_filename = resolve_relative_path(filename);
                        if (new_filename)
                                filename = new_filename;

-                       if (flags & GET_SHA1_FOLLOW_SYMLINKS) {
+                       if (flags & GET_OID_FOLLOW_SYMLINKS) {

                                ret = get_tree_entry_follow_symlinks(tree_oid.hash,
                                        filename, oid->hash, &oc->symlink_path,
                                        &oc->mode);
                                ret = get_tree_entry_follow_symlinks(tree_oid.hash,
                                        filename, oid->hash, &oc->symlink_path,
                                        &oc->mode);


@@ -1615,7 +1615,7 @@ static int get_oid_with_context_1(const char *name,
                                }
                        }
                        hashcpy(oc->tree, tree_oid.hash);
                                }
                        }
                        hashcpy(oc->tree, tree_oid.hash);

-                       if (flags & GET_SHA1_RECORD_PATH)
+                       if (flags & GET_OID_RECORD_PATH)

                                oc->path = xstrdup(filename);
 
                        free(new_filename);
                                oc->path = xstrdup(filename);
 
                        free(new_filename);


@@ -1639,12 +1639,12 @@ void maybe_die_on_misspelt_object_name(const char *name, const char *prefix)
 {
        struct object_context oc;
        struct object_id oid;
 {
        struct object_context oc;
        struct object_id oid;

-       get_oid_with_context_1(name, GET_SHA1_ONLY_TO_DIE, prefix, &oid, &oc);
+       get_oid_with_context_1(name, GET_OID_ONLY_TO_DIE, prefix, &oid, &oc);

 }
 
 int get_oid_with_context(const char *str, unsigned flags, struct object_id *oid, struct object_context *oc)
 {
 }
 
 int get_oid_with_context(const char *str, unsigned flags, struct object_id *oid, struct object_context *oc)
 {

-       if (flags & GET_SHA1_FOLLOW_SYMLINKS && flags & GET_SHA1_ONLY_TO_DIE)
+       if (flags & GET_OID_FOLLOW_SYMLINKS && flags & GET_OID_ONLY_TO_DIE)

                die("BUG: incompatible flags for get_sha1_with_context");
        return get_oid_with_context_1(str, flags, NULL, oid, oc);
 }
                die("BUG: incompatible flags for get_sha1_with_context");
        return get_oid_with_context_1(str, flags, NULL, oid, oc);
 }