Do not name "repo" struct "remote" in push_http.c

diff --git a/hash-object.c b/hash-object.c
index ce04d150a444e6c9b68097721180c998039f632e..ebb3bedb074202a29e2356845012bd1ffae0dc19 100644 (file)
--- a/hash-object.c
+++ b/hash-object.c
@@ -8,6 +8,7 @@
 #include "blob.h"
 #include "quote.h"
 #include "parse-options.h"
+#include "exec_cmd.h"
 
 static void hash_fd(int fd, const char *type, int write_object, const char *path)
 {
@@ -34,10 +35,8 @@ static void hash_object(const char *path, const char *type, int write_object,
 
 static void hash_stdin_paths(const char *type, int write_objects)
 {
-       struct strbuf buf, nbuf;
+       struct strbuf buf = STRBUF_INIT, nbuf = STRBUF_INIT;
 
-       strbuf_init(&buf, 0);
-       strbuf_init(&nbuf, 0);
        while (strbuf_getline(&buf, stdin, '\n') != EOF) {
                if (buf.buf[0] == '"') {
                        strbuf_reset(&nbuf);
@@ -52,7 +51,7 @@ static void hash_stdin_paths(const char *type, int write_objects)
 }
 
 static const char * const hash_object_usage[] = {
-       "git hash-object [-t <type>] [-w] [--path=<file>] [--stdin] [--] <file>...",
+       "git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] <file>...",
        "git hash-object  --stdin-paths < <list-of-paths>",
        NULL
 };
@@ -61,6 +60,7 @@ static const char *type;
 static int write_object;
 static int hashstdin;
 static int stdin_paths;
+static int no_filters;
 static const char *vpath;
 
 static const struct option hash_object_options[] = {
@@ -68,6 +68,7 @@ static const struct option hash_object_options[] = {
        OPT_BOOLEAN('w', NULL, &write_object, "write the object into the object database"),
        OPT_BOOLEAN( 0 , "stdin", &hashstdin, "read the object from stdin"),
        OPT_BOOLEAN( 0 , "stdin-paths", &stdin_paths, "read file names from stdin"),
+       OPT_BOOLEAN( 0 , "no-filters", &no_filters, "store file as is without filters"),
        OPT_STRING( 0 , "path", &vpath, "file", "process file as it were from this path"),
        OPT_END()
 };
@@ -81,7 +82,7 @@ int main(int argc, const char **argv)
 
        type = blob_type;
 
-       git_config(git_default_config, NULL);
+       git_extract_argv0_path(argv[0]);
 
        argc = parse_options(argc, argv, hash_object_options, hash_object_usage, 0);
 
@@ -92,6 +93,8 @@ int main(int argc, const char **argv)
                        vpath = prefix_filename(prefix, prefix_length, vpath);
        }
 
+       git_config(git_default_config, NULL);
+
        if (stdin_paths) {
                if (hashstdin)
                        errstr = "Can't use --stdin-paths with --stdin";
@@ -99,12 +102,18 @@ int main(int argc, const char **argv)
                        errstr = "Can't specify files with --stdin-paths";
                else if (vpath)
                        errstr = "Can't use --stdin-paths with --path";
+               else if (no_filters)
+                       errstr = "Can't use --stdin-paths with --no-filters";
+       }
+       else {
+               if (hashstdin > 1)
+                       errstr = "Multiple --stdin arguments are not supported";
+               if (vpath && no_filters)
+                       errstr = "Can't use --path with --no-filters";
        }
-       else if (hashstdin > 1)
-               errstr = "Multiple --stdin arguments are not supported";
 
        if (errstr) {
-               error (errstr);
+               error("%s", errstr);
                usage_with_options(hash_object_usage, hash_object_options);
        }
 
@@ -116,7 +125,8 @@ int main(int argc, const char **argv)
 
                if (0 <= prefix_length)
                        arg = prefix_filename(prefix, prefix_length, arg);
-               hash_object(arg, type, write_object, vpath ? vpath : arg);
+               hash_object(arg, type, write_object,
+                           no_filters ? NULL : vpath ? vpath : arg);
        }
 
        if (stdin_paths)