hash-object: always try to set up the git repository

When "hash-object" is run without "-w", we don't need to be in a git repository at all; we can just hash the object and write its sha1 to stdout. However, if we _are_ in a git repository, we would want to know that so we can follow the normal rules for respecting config, .gitattributes, etc. This happens to work at the top-level of a git repository because we blindly read ".git/config", but as the included test shows, it does not work when you are in a subdirectory. The solution is to just do a "gentle" setup in this case. We already take care to use prefix_filename() on any filename arguments we get (to handle the "-w" case), so we don't need to do anything extra to handle the side effects of repo setup. An alternative would be to specify RUN_SETUP_GENTLY for this command in git.c, and then die if "-w" is set but we are not in a repository. However, the error messages generated at the time of setup_git_directory() are more detailed, so it's better to find out which mode we are in, and then call the appropriate function. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed Sep 12, 2016 at 20:23 UTC 0e94ee9415e6cf6952b755347b57319e93356210
2 files changed +19 -5
builtin/hash-object.c
+8 -5
@@ -87,6 +87,7 @@ int cmd_hash_object(int argc, const char **argv, const char *prefix)
87 int stdin_paths = 0;
88 int no_filters = 0;
89 int literally = 0;
90 + int nongit = 0;
91 unsigned flags = HASH_FORMAT_CHECK;
92 const char *vpath = NULL;
93 const struct option hash_object_options[] = {
@@ -107,12 +108,14 @@ int cmd_hash_object(int argc, const char **argv, const char *prefix)
108 argc = parse_options(argc, argv, NULL, hash_object_options,
109 hash_object_usage, 0);
110
110 - if (flags & HASH_WRITE_OBJECT) {
111 + if (flags & HASH_WRITE_OBJECT)
112 prefix = setup_git_directory();
112 - prefix_length = prefix ? strlen(prefix) : 0;
113 - if (vpath && prefix)
114 - vpath = prefix_filename(prefix, prefix_length, vpath);
115 - }
113 + else
114 + prefix = setup_git_directory_gently(&nongit);
115 +
116 + prefix_length = prefix ? strlen(prefix) : 0;
117 + if (vpath && prefix)
118 + vpath = prefix_filename(prefix, prefix_length, vpath);
119
120 git_config(git_default_config, NULL);
121
t/t1007-hash-object.sh
+11
@@ -121,6 +121,17 @@ test_expect_success 'check that appropriate filter is invoke when --path is used
121 git config --unset core.autocrlf
122 '
123
124 +test_expect_success 'gitattributes also work in a subdirectory' '
125 + mkdir subdir &&
126 + (
127 + cd subdir &&
128 + subdir_sha0=$(git hash-object ../file0) &&
129 + subdir_sha1=$(git hash-object ../file1) &&
130 + test "$file0_sha" = "$subdir_sha0" &&
131 + test "$file1_sha" = "$subdir_sha1"
132 + )
133 +'
134 +
135 test_expect_success 'check that --no-filters option works' '
136 echo fooQ | tr Q "\\015" >file0 &&
137 cp file0 file1 &&