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 1d73f1daf514ae02fb7dddb2120252b7dbd82600..a77458f2f6eb108a90a1cf3d2cc4a771549c05f9 100644 (file)
--- 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");
 
        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 (!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;
 
        if (commit_lock_file(packed_ref_cache->lock)) {
                save_errno = errno;