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-checkout-index.c | |
| parent | d6cf61bfd4bccffcc8b095f8469dbe749d70abdf (diff) | |
| download | git-4ed7cd3ab07f7c721daf4241fe1dac306fefd1fb.tar.gz | |
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-checkout-index.c')
| -rw-r--r-- | builtin-checkout-index.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin-checkout-index.c b/builtin-checkout-index.c index 70d619da8d..7e42024c67 100644 --- a/builtin-checkout-index.c +++ b/builtin-checkout-index.c @@ -246,8 +246,8 @@ int cmd_checkout_index(int argc, const char **argv, const char *prefix) * want to update cache. */ if (state.refresh_cache) { - close(newfd); newfd = -1; rollback_lock_file(&lock_file); + newfd = -1; } state.refresh_cache = 0; } @@ -297,7 +297,7 @@ int cmd_checkout_index(int argc, const char **argv, const char *prefix) if (0 <= newfd && (write_cache(newfd, active_cache, active_nr) || - close(newfd) || commit_locked_index(&lock_file))) + commit_locked_index(&lock_file))) die("Unable to write new index file"); return 0; } |