Make lock local to fetch_pack

Matt Kraai · gitster · commit 9dacffc04009 · 2012-12-19T19:00:00.000-08:00
lock is only used by fetch_pack, so move it into that function.

Signed-off-by: Matt Kraai &lt;matt.kraai@amo.abbott.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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");

Original file line number	Diff line number	Diff line change
`@@ -875,8 +875,6 @@ static int fetch_pack_config(const char var, const char value, void *cb)`
`875`	`875`	`return git_default_config(var, value, cb);`
`876`	`876`	`}`
`877`	`877`
`878`		`-static struct lock_file lock;`
`879`		`-`
`880`	`878`	`static void fetch_pack_setup(void)`
`881`	`879`	`{`
`882`	`880`	`static int did_setup;`
`@@ -1069,6 +1067,7 @@ struct ref fetch_pack(struct fetch_pack_args my_args,`
`1069`	`1067`	`ref_cpy = do_fetch_pack(fd, ref, sought, pack_lockfile);`
`1070`	`1068`
`1071`	`1069`	`if (args.depth > 0) {`
	`1070`	`+ static struct lock_file lock;`
`1072`	`1071`	`struct cache_time mtime;`
`1073`	`1072`	`struct strbuf sb = STRBUF_INIT;`
`1074`	`1073`	`char *shallow = git_path("shallow");`