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 /fast-import.c | |
| parent | c76dc9592d1c770212d50ee7a7028a74f472f23b (diff) | |
| parent | db87e3960c5a770db13c9ba9602b5e88848e2d1a (diff) | |
| download | git-c4275591fbb7d582c397b228e38dbb8419c89330.tar.gz git-c4275591fbb7d582c397b228e38dbb8419c89330.tar.xz | |
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 'fast-import.c')
| -rw-r--r-- | fast-import.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fast-import.c b/fast-import.c index ccdf2e57b..ab6689a64 100644 --- a/fast-import.c +++ b/fast-import.c @@ -816,7 +816,7 @@ static void start_packfile(void) int pack_fd; snprintf(tmpfile, sizeof(tmpfile), - "%s/tmp_pack_XXXXXX", get_object_directory()); + "%s/pack/tmp_pack_XXXXXX", get_object_directory()); pack_fd = xmkstemp(tmpfile); p = xcalloc(1, sizeof(*p) + strlen(tmpfile) + 2); strcpy(p->pack_name, tmpfile); @@ -878,7 +878,7 @@ static char *create_index(void) } snprintf(tmpfile, sizeof(tmpfile), - "%s/tmp_idx_XXXXXX", get_object_directory()); + "%s/pack/tmp_idx_XXXXXX", get_object_directory()); idx_fd = xmkstemp(tmpfile); f = sha1fd(idx_fd, tmpfile); sha1write(f, array, 256 * sizeof(int)); |