Merge branch 'jn/show-normalized-refs'

diff --git a/hash-object.c b/hash-object.c
index adfd5336a31412681415c47d2420aba8ed299ae3..9455dd0709aeb81436ef2e3e36422578d66ce8e7 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)
 {
@@ -28,7 +29,7 @@ static void hash_object(const char *path, const char *type, int write_object,
        int fd;
        fd = open(path, O_RDONLY);
        if (fd < 0)
-               die("Cannot open %s", path);
+               die_errno("Cannot open '%s'", path);
        hash_fd(fd, type, write_object, vpath);
 }
 
@@ -81,7 +82,10 @@ int main(int argc, const char **argv)
 
        type = blob_type;
 
-       argc = parse_options(argc, argv, hash_object_options, hash_object_usage, 0);
+       git_extract_argv0_path(argv[0]);
+
+       argc = parse_options(argc, argv, NULL, hash_object_options,
+                            hash_object_usage, 0);
 
        if (write_object) {
                prefix = setup_git_directory();