diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-01-03 18:28:26 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-03 18:28:33 (GMT) |
| commit | 8cabd200d2499954e47d8ec79ac7f4f45d9deb2e (patch) | |
| tree | c8ddb29352e28899ad2b9e679fdbbae0695ddd94 /fetch-pack.c | |
| parent | 324dfac8c990c38b1f8eb5a736be4e9e6b490e48 (diff) | |
| parent | 40036bedb90aa25757c14a748a34a631c547e1d1 (diff) | |
| download | git-8cabd200d2499954e47d8ec79ac7f4f45d9deb2e.zip git-8cabd200d2499954e47d8ec79ac7f4f45d9deb2e.tar.gz git-8cabd200d2499954e47d8ec79ac7f4f45d9deb2e.tar.bz2 | |
Merge branch 'mk/qnx'
Port to QNX.
* mk/qnx:
Port to QNX
Make lock local to fetch_pack
Diffstat (limited to 'fetch-pack.c')
| -rw-r--r-- | fetch-pack.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fetch-pack.c b/fetch-pack.c index 099ff4d..f0acdf7 100644 --- a/fetch-pack.c +++ b/fetch-pack.c @@ -874,8 +874,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; @@ -917,6 +915,7 @@ struct ref *fetch_pack(struct fetch_pack_args *args, ref_cpy = do_fetch_pack(args, 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"); |