diff options
| author | Brandon Casey <casey@nrlssc.navy.mil> | 2008-01-16 22:12:46 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-01-17 02:35:35 +0300 |
| commit | 4ed7cd3ab07f7c721daf4241fe1dac306fefd1fb (patch) | |
| tree | e3b03a59cd0bca192fb396522f813210451404b8 /builtin-pack-refs.c | |
| parent | d6cf61bfd4bccffcc8b095f8469dbe749d70abdf (diff) | |
Improve use of lockfile API
Remove remaining double close(2)'s. i.e. close() before
commit_locked_index() or commit_lock_file().
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-pack-refs.c')
| -rw-r--r-- | builtin-pack-refs.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/builtin-pack-refs.c b/builtin-pack-refs.c index 1923fb1914..1aaa76dd1f 100644 --- a/builtin-pack-refs.c +++ b/builtin-pack-refs.c @@ -108,6 +108,12 @@ static int pack_refs(unsigned int flags) die("failed to write ref-pack file"); if (fflush(cbdata.refs_file) || fsync(fd) || fclose(cbdata.refs_file)) die("failed to write ref-pack file (%s)", strerror(errno)); + /* + * Since the lock file was fdopen()'ed and then fclose()'ed above, + * assign -1 to the lock file descriptor so that commit_lock_file() + * won't try to close() it. + */ + packed.fd = -1; if (commit_lock_file(&packed) < 0) die("unable to overwrite old ref-pack file (%s)", strerror(errno)); if (cbdata.flags & PACK_REFS_PRUNE) |