has_sha1_file: don't bother if we are not in a repository

jrn · gitster · commit 3e8b7d3c77c4 · 2017-04-13T18:33:11.000-07:00
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 &lt;jrnieder@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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))

Original file line number	Diff line number	Diff line change
`@@ -3320,6 +3320,8 @@ int has_sha1_file_with_flags(const unsigned char *sha1, int flags)`
`3320`	`3320`	`{`
`3321`	`3321`	`struct pack_entry e;`
`3322`	`3322`
	`3323`	`+ if (!startup_info->have_repository)`
	`3324`	`+ return 0;`
`3323`	`3325`	`if (find_pack_entry(sha1, &e))`
`3324`	`3326`	`return 1;`
`3325`	`3327`	`if (has_loose_object(sha1))`