diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2017-04-11 22:47:13 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-04-14 01:33:11 (GMT) |
| commit | 3e8b7d3c77c464b29f7f3e0627ca7354f7de433a (patch) | |
| tree | 0baf768667701ea44eb67bd58d512ac82cf496fa /sha1_file.c | |
| parent | 3e98919a188e36f34c1a20e23ecf2ff1f5da75c9 (diff) | |
| download | git-3e8b7d3c77c464b29f7f3e0627ca7354f7de433a.zip git-3e8b7d3c77c464b29f7f3e0627ca7354f7de433a.tar.gz git-3e8b7d3c77c464b29f7f3e0627ca7354f7de433a.tar.bz2 | |
has_sha1_file: don't bother if we are not in a repository
Most callers to this function already require that they are in a
git repository, but there is an exception: "git apply" uses
has_sha1_file to avoid work if the result of applying a binary
patch is already present in the repository. When run outside any
repository, this produces an error:
fatal: BUG: setup_git_env called without repository
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sha1_file.c')
| -rw-r--r-- | sha1_file.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sha1_file.c b/sha1_file.c index 2eda929..18bfb4f 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -3320,6 +3320,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)) |