Merge branch 'mk/qnx'

Port to QNX.

* mk/qnx:
  Port to QNX
  Make lock local to fetch_pack
This commit is contained in:
Junio C Hamano
2013-01-03 10:28:26 -08:00
3 changed files with 27 additions and 3 deletions

View File

@ -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");