undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t/helper/test-write-cache: clean up lock-handling

Browse Source 
Die in case writing the index fails, so that the caller can notice
(instead of, say, being impressed by how performant the writing is).

While at it, note that after opening a lock with `LOCK_DIE_ON_ERROR`, we
do not need to worry about whether we succeeded. Also, we can move the
`struct lock_file` into the function and drop the staticness. (Placing
`struct lock_file`s on the stack used to be a bad idea, because the
temp- and lockfile-machinery would keep a pointer into the struct. But
after 076aa2cbd (tempfile: auto-allocate tempfiles on heap, 2017-09-05),
we can safely have lockfiles on the stack.)

Signed-off-by: Martin Ågren <martin.agren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Martin Ågren 2018-05-09 22:55:35 +02:00 committed by Junio C Hamano
parent 468165c1d8
commit 75d9a25e1f
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
t/helper/test-write-cache.c
View File

@ -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;