diff options
| author | Brandon Casey <casey@nrlssc.navy.mil> | 2008-01-16 13:12:46 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-01-16 15:35:35 -0800 |
| commit | 4ed7cd3ab07f7c721daf4241fe1dac306fefd1fb (patch) | |
| tree | e3b03a59cd0bca192fb396522f813210451404b8 /builtin-write-tree.c | |
| parent | d6cf61bfd4bccffcc8b095f8469dbe749d70abdf (diff) | |
| download | git-4ed7cd3ab07f7c721daf4241fe1dac306fefd1fb.tar.gz git-4ed7cd3ab07f7c721daf4241fe1dac306fefd1fb.tar.xz | |
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-write-tree.c')
| -rw-r--r-- | builtin-write-tree.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/builtin-write-tree.c b/builtin-write-tree.c index b89d02efe..d16b9ed00 100644 --- a/builtin-write-tree.c +++ b/builtin-write-tree.c @@ -35,11 +35,9 @@ int write_tree(unsigned char *sha1, int missing_ok, const char *prefix) missing_ok, 0) < 0) die("git-write-tree: error building trees"); if (0 <= newfd) { - if (!write_cache(newfd, active_cache, active_nr) - && !close(newfd)) { - commit_lock_file(lock_file); + if (!write_cache(newfd, active_cache, active_nr) && + !commit_lock_file(lock_file)) newfd = -1; - } } /* Not being able to write is fine -- we are only interested * in updating the cache-tree part, and if the next caller @@ -60,8 +58,7 @@ int write_tree(unsigned char *sha1, int missing_ok, const char *prefix) hashcpy(sha1, active_cache_tree->sha1); if (0 <= newfd) - close(newfd); - rollback_lock_file(lock_file); + rollback_lock_file(lock_file); return 0; } |