diff options
Diffstat (limited to 't/helper')
| -rw-r--r-- | t/helper/test-write-cache.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/t/helper/test-write-cache.c b/t/helper/test-write-cache.c index b7ee039669..3d78c728a5 100644 --- a/t/helper/test-write-cache.c +++ b/t/helper/test-write-cache.c @@ -1,22 +1,18 @@ #include "cache.h" #include "lockfile.h" -static struct lock_file index_lock; - int cmd_main(int argc, const char **argv) { - int i, cnt = 1, lockfd; + struct lock_file index_lock = LOCK_INIT; + int i, cnt = 1; if (argc == 2) cnt = strtol(argv[1], NULL, 0); setup_git_directory(); read_cache(); for (i = 0; i < cnt; i++) { - lockfd = hold_locked_index(&index_lock, LOCK_DIE_ON_ERROR); - if (0 <= lockfd) { - write_locked_index(&the_index, &index_lock, COMMIT_LOCK); - } else { - rollback_lock_file(&index_lock); - } + hold_locked_index(&index_lock, LOCK_DIE_ON_ERROR); + if (write_locked_index(&the_index, &index_lock, COMMIT_LOCK)) + die("unable to write index file"); } return 0; |