summaryrefslogtreecommitdiff
path: root/fast-import.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-08-19 21:48:55 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-08-19 21:48:55 (GMT)
commit51a22ce1477b991793c20d3143d72f0ae6e38c76 (patch)
treed771608f4ebc48a899196524534b5912632cd843 /fast-import.c
parent4bfab58ce2d47cef9236571cb1451bf3b62241c1 (diff)
parentcb5add58681db299d22cdccd898f9924e740034a (diff)
downloadgit-51a22ce1477b991793c20d3143d72f0ae6e38c76.zip
git-51a22ce1477b991793c20d3143d72f0ae6e38c76.tar.gz
git-51a22ce1477b991793c20d3143d72f0ae6e38c76.tar.bz2
Merge branch 'jc/finalize-temp-file'
Long overdue micro clean-up. * jc/finalize-temp-file: sha1_file.c: rename move_temp_to_file() to finalize_object_file()
Diffstat (limited to 'fast-import.c')
-rw-r--r--fast-import.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fast-import.c b/fast-import.c
index 2ad4fee..79d2bff 100644
--- a/fast-import.c
+++ b/fast-import.c
@@ -923,12 +923,12 @@ static char *keep_pack(const char *curr_index_name)
snprintf(name, sizeof(name), "%s/pack/pack-%s.pack",
get_object_directory(), sha1_to_hex(pack_data->sha1));
- if (move_temp_to_file(pack_data->pack_name, name))
+ if (finalize_object_file(pack_data->pack_name, name))
die("cannot store pack file");
snprintf(name, sizeof(name), "%s/pack/pack-%s.idx",
get_object_directory(), sha1_to_hex(pack_data->sha1));
- if (move_temp_to_file(curr_index_name, name))
+ if (finalize_object_file(curr_index_name, name))
die("cannot store index file");
free((void *)curr_index_name);
return name;