apply: do not get confused by symlinks in the middle

diff --git a/hash-object.c b/hash-object.c
index c3d05a853a5518d2800eb65a00c181f6d8ab312f..18f5017f51bcac5798e959991be37c7cd6d70528 100644 (file)
--- a/hash-object.c
+++ b/hash-object.c
@@ -2,11 +2,12 @@
  * GIT - The information manager from hell
  *
  * Copyright (C) Linus Torvalds, 2005
- * Copyright (C) Junio C Hamano, 2005 
+ * Copyright (C) Junio C Hamano, 2005
  */
 #include "cache.h"
+#include "blob.h"
 
-static void hash_object(const char *path, const char *type, int write_object)
+static void hash_object(const char *path, enum object_type type, int write_object)
 {
        int fd;
        struct stat st;
@@ -14,43 +15,66 @@ static void hash_object(const char *path, const char *type, int write_object)
        fd = open(path, O_RDONLY);
        if (fd < 0 ||
            fstat(fd, &st) < 0 ||
-           index_fd(sha1, fd, &st, write_object, type))
+           index_fd(sha1, fd, &st, write_object, type, path))
                die(write_object
                    ? "Unable to add %s to database"
                    : "Unable to hash %s", path);
        printf("%s\n", sha1_to_hex(sha1));
 }
 
+static void hash_stdin(const char *type, int write_object)
+{
+       unsigned char sha1[20];
+       if (index_pipe(sha1, 0, type, write_object))
+               die("Unable to add stdin to database");
+       printf("%s\n", sha1_to_hex(sha1));
+}
+
 static const char hash_object_usage[] =
-"git-hash-object [-t <type>] [-w] <file>...";
+"git-hash-object [-t <type>] [-w] [--stdin] <file>...";
 
 int main(int argc, char **argv)
 {
        int i;
-       const char *type = "blob";
+       const char *type = blob_type;
        int write_object = 0;
-       const char *prefix;
+       const char *prefix = NULL;
        int prefix_length = -1;
+       int no_more_flags = 0;
 
        for (i = 1 ; i < argc; i++) {
-               if (!strcmp(argv[i], "-t")) {
-                       if (argc <= ++i)
-                               die(hash_object_usage);
-                       type = argv[i];
-               }
-               else if (!strcmp(argv[i], "-w")) {
-                       if (prefix_length < 0) {
-                               prefix = setup_git_directory();
-                               prefix_length = prefix ? strlen(prefix) : 0;
+               if (!no_more_flags && argv[i][0] == '-') {
+                       if (!strcmp(argv[i], "-t")) {
+                               if (argc <= ++i)
+                                       usage(hash_object_usage);
+                               type = argv[i];
+                       }
+                       else if (!strcmp(argv[i], "-w")) {
+                               if (prefix_length < 0) {
+                                       prefix = setup_git_directory();
+                                       prefix_length =
+                                               prefix ? strlen(prefix) : 0;
+                               }
+                               write_object = 1;
+                       }
+                       else if (!strcmp(argv[i], "--")) {
+                               no_more_flags = 1;
+                       }
+                       else if (!strcmp(argv[i], "--help"))
+                               usage(hash_object_usage);
+                       else if (!strcmp(argv[i], "--stdin")) {
+                               hash_stdin(type, write_object);
                        }
-                       write_object = 1;
+                       else
+                               usage(hash_object_usage);
                }
                else {
-                       char *arg = argv[i];
+                       const char *arg = argv[i];
                        if (0 <= prefix_length)
                                arg = prefix_filename(prefix, prefix_length,
                                                      arg);
-                       hash_object(arg, type, write_object);
+                       hash_object(arg, type_from_string(type), write_object);
+                       no_more_flags = 1;
                }
        }
        return 0;