From: Michael Haggerty <mhagger@alum.mit.edu>
Date: Wed, 1 Oct 2014 11:14:49 +0000 (+0200)
Subject: commit_packed_refs(): reimplement using fdopen_lock_file()
X-Git-Tag: v2.2.0-rc0~52^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6e578a31e6662c69107eb4587d1024dd9f38cc3c;p=thirdparty%2Fgit.git

commit_packed_refs(): reimplement using fdopen_lock_file()

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/refs.c b/refs.c
index 1d73f1daf5..a77458f2f6 100644
--- a/refs.c
+++ b/refs.c
@@ -2309,16 +2309,13 @@ int commit_packed_refs(void)
 	if (!packed_ref_cache->lock)
 		die("internal error: packed-refs not locked");
 
-	out = fdopen(packed_ref_cache->lock->fd, "w");
+	out = fdopen_lock_file(packed_ref_cache->lock, "w");
 	if (!out)
 		die_errno("unable to fdopen packed-refs descriptor");
 
 	fprintf_or_die(out, "%s", PACKED_REFS_HEADER);
 	do_for_each_entry_in_dir(get_packed_ref_dir(packed_ref_cache),
 				 0, write_packed_entry_fn, out);
-	if (fclose(out))
-		die_errno("write error");
-	packed_ref_cache->lock->fd = -1;
 
 	if (commit_lock_file(packed_ref_cache->lock)) {
 		save_errno = errno;