diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-04-19 21:37:20 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-04-19 21:37:20 -0700 |
| commit | eb3af74e93953df7917dca43d264ac8d1fb85671 (patch) | |
| tree | 11c6b0ae899ca4c5994e1b6d04f9bd9e4c01f251 | |
| parent | 5ab8f2261fa2b595abe433dd50be0f2aaec14aa0 (diff) | |
| parent | bccb22cbb15d45c940da4c54231949c722d4fe30 (diff) | |
| download | git-eb3af74e93953df7917dca43d264ac8d1fb85671.tar.gz | |
Merge branch 'jk/no-looking-at-dotgit-outside-repo'
Clean up fallouts from recent tightening of the set-up sequence,
where Git barfs when repository information is accessed without
first ensuring that it was started in a repository.
* jk/no-looking-at-dotgit-outside-repo:
test-read-cache: setup git dir
has_sha1_file: don't bother if we are not in a repository
| -rw-r--r-- | sha1_file.c | 2 | ||||
| -rw-r--r-- | t/helper/test-read-cache.c | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/sha1_file.c b/sha1_file.c index 2270f36a2b..1577e2d7dd 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -3481,6 +3481,8 @@ int has_sha1_file_with_flags(const unsigned char *sha1, int flags) { struct pack_entry e; + if (!startup_info->have_repository) + return 0; if (find_pack_entry(sha1, &e)) return 1; if (has_loose_object(sha1)) diff --git a/t/helper/test-read-cache.c b/t/helper/test-read-cache.c index 2a7990efc3..48255eef31 100644 --- a/t/helper/test-read-cache.c +++ b/t/helper/test-read-cache.c @@ -5,6 +5,7 @@ int cmd_main(int argc, const char **argv) int i, cnt = 1; if (argc == 2) cnt = strtol(argv[1], NULL, 0); + setup_git_directory(); for (i = 0; i < cnt; i++) { read_cache(); discard_cache(); |