diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-09-23 02:05:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-09-23 02:05:35 -0700 |
| commit | c4275591fbb7d582c397b228e38dbb8419c89330 (patch) | |
| tree | c373b96e267cdc6760ef579135113284985fb7cf /builtin-pack-objects.c | |
| parent | c76dc9592d1c770212d50ee7a7028a74f472f23b (diff) | |
| parent | db87e3960c5a770db13c9ba9602b5e88848e2d1a (diff) | |
| download | git-c4275591fbb7d582c397b228e38dbb8419c89330.tar.gz | |
Merge branch 'maint'
* maint:
builtin-prune.c: prune temporary packs in <object_dir>/pack directory
Do not perform cross-directory renames when creating packs
Diffstat (limited to 'builtin-pack-objects.c')
| -rw-r--r-- | builtin-pack-objects.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-pack-objects.c b/builtin-pack-objects.c index 5fc1b8c6fb..1158e42cba 100644 --- a/builtin-pack-objects.c +++ b/builtin-pack-objects.c @@ -465,7 +465,7 @@ static void write_pack_file(void) char tmpname[PATH_MAX]; int fd; snprintf(tmpname, sizeof(tmpname), - "%s/tmp_pack_XXXXXX", get_object_directory()); + "%s/pack/tmp_pack_XXXXXX", get_object_directory()); fd = xmkstemp(tmpname); pack_tmp_name = xstrdup(tmpname); f = sha1fd(fd, pack_tmp_name); |