hash-object: handle --literally with OPT_NEGBIT

Since we recently removed the hash_literally() function, the hash-object
--literally option has been simplified to just removing the
INDEX_FORMAT_CHECK flag. Rather than pass it around as a separate bool,
we can just have the option parser remove the bit from the set of flags
directly. This simplifies the helper functions.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/hash-object.c b/builtin/hash-object.c
index 1ecb70b551fe694c151f9cab69e670979fee3dbd..6a99ec250d028fd39dcba912993722a8b686126f 100644 (file)
--- a/builtin/hash-object.c
+++ b/builtin/hash-object.c
@@ -19,15 +19,11 @@
 #include "strbuf.h"
 #include "write-or-die.h"
 
-static void hash_fd(int fd, const char *type, const char *path, unsigned flags,
-                   int literally)
+static void hash_fd(int fd, const char *type, const char *path, unsigned flags)
 {
        struct stat st;
        struct object_id oid;
 
-       if (literally)
-               flags &= ~INDEX_FORMAT_CHECK;
-
        if (fstat(fd, &st) < 0 ||
            index_fd(the_repository->index, &oid, fd, &st,
                     type_from_string(type), path, flags))
@@ -39,15 +35,14 @@ static void hash_fd(int fd, const char *type, const char *path, unsigned flags,
 }
 
 static void hash_object(const char *path, const char *type, const char *vpath,
-                       unsigned flags, int literally)
+                       unsigned flags)
 {
        int fd;
        fd = xopen(path, O_RDONLY);
-       hash_fd(fd, type, vpath, flags, literally);
+       hash_fd(fd, type, vpath, flags);
 }
 
-static void hash_stdin_paths(const char *type, int no_filters, unsigned flags,
-                            int literally)
+static void hash_stdin_paths(const char *type, int no_filters, unsigned flags)
 {
        struct strbuf buf = STRBUF_INIT;
        struct strbuf unquoted = STRBUF_INIT;
@@ -59,8 +54,7 @@ static void hash_stdin_paths(const char *type, int no_filters, unsigned flags,
                                die("line is badly quoted");
                        strbuf_swap(&buf, &unquoted);
                }
-               hash_object(buf.buf, type, no_filters ? NULL : buf.buf, flags,
-                           literally);
+               hash_object(buf.buf, type, no_filters ? NULL : buf.buf, flags);
        }
        strbuf_release(&buf);
        strbuf_release(&unquoted);
@@ -81,7 +75,6 @@ int cmd_hash_object(int argc,
        int hashstdin = 0;
        int stdin_paths = 0;
        int no_filters = 0;
-       int literally = 0;
        int nongit = 0;
        unsigned flags = INDEX_FORMAT_CHECK;
        const char *vpath = NULL;
@@ -93,7 +86,9 @@ int cmd_hash_object(int argc,
                OPT_COUNTUP( 0 , "stdin", &hashstdin, N_("read the object from stdin")),
                OPT_BOOL( 0 , "stdin-paths", &stdin_paths, N_("read file names from stdin")),
                OPT_BOOL( 0 , "no-filters", &no_filters, N_("store file as is without filters")),
-               OPT_BOOL( 0, "literally", &literally, N_("just hash any random garbage to create corrupt objects for debugging Git")),
+               OPT_NEGBIT( 0, "literally", &flags,
+                           N_("just hash any random garbage to create corrupt objects for debugging Git"),
+                           INDEX_FORMAT_CHECK),
                OPT_STRING( 0 , "path", &vpath, N_("file"), N_("process file as it were from this path")),
                OPT_END()
        };
@@ -139,7 +134,7 @@ int cmd_hash_object(int argc,
        }
 
        if (hashstdin)
-               hash_fd(0, type, vpath, flags, literally);
+               hash_fd(0, type, vpath, flags);
 
        for (i = 0 ; i < argc; i++) {
                const char *arg = argv[i];
@@ -148,12 +143,12 @@ int cmd_hash_object(int argc,
                if (prefix)
                        arg = to_free = prefix_filename(prefix, arg);
                hash_object(arg, type, no_filters ? NULL : vpath ? vpath : arg,
-                           flags, literally);
+                           flags);
                free(to_free);
        }
 
        if (stdin_paths)
-               hash_stdin_paths(type, no_filters, flags, literally);
+               hash_stdin_paths(type, no_filters, flags);
 
        free(vpath_free);