From: Matt Kraai <matt.kraai@amo.abbott.com>
Date: Tue, 18 Dec 2012 22:03:54 +0000 (-0800)
Subject: Make lock local to fetch_pack
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9dacffc04009529b37c94de9a26420f640cf3f59;p=git.git

Make lock local to fetch_pack

lock is only used by fetch_pack, so move it into that function.

Signed-off-by: Matt Kraai <matt.kraai@amo.abbott.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin/fetch-pack.c b/builtin/fetch-pack.c
index e6443986b..9bc10b316 100644
--- a/builtin/fetch-pack.c
+++ b/builtin/fetch-pack.c
@@ -875,8 +875,6 @@ static int fetch_pack_config(const char *var, const char *value, void *cb)
 	return git_default_config(var, value, cb);
 }
 
-static struct lock_file lock;
-
 static void fetch_pack_setup(void)
 {
 	static int did_setup;
@@ -1069,6 +1067,7 @@ struct ref *fetch_pack(struct fetch_pack_args *my_args,
 	ref_cpy = do_fetch_pack(fd, ref, sought, pack_lockfile);
 
 	if (args.depth > 0) {
+		static struct lock_file lock;
 		struct cache_time mtime;
 		struct strbuf sb = STRBUF_INIT;
 		char *shallow = git_path("shallow");