From: Matt Kraai Date: Tue, 18 Dec 2012 22:03:54 GMT Subject: [PATCH v2 1/2] Make lock local to fetch_pack Message-ID: <1355868235-23173-2-git-send-email-kraai@ftbfs.org> In-Reply-To: <1355868235-23173-1-git-send-email-kraai@ftbfs.org> From: Matt Kraai lock is only used by fetch_pack, so move it into that function. Signed-off-by: Matt Kraai --- builtin/fetch-pack.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/builtin/fetch-pack.c b/builtin/fetch-pack.c index e644398..9bc10b3 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"); -- 1.8.0.2.8.gc42826d.dirty