@matheusbsbs / matheus-bagliano / commits / 02ae242fdd

checkout-index: simplify locking logic

`newfd` starts out negative. If we then take the lock, `newfd` will become non-negative. We later check for exactly that property before calling `write_locked_index()`. That is, we are simply using `newfd` as a boolean to keep track of whether we took the lock or not. (We always use `newfd` and `lock_file` together, so they really are mirroring each other.) Drop `newfd` and check with `is_lock_file_locked()` instead. While at it, move the `static struct lock_file` into `cmd_checkout_index()` and make it non-static. It is only used in this function, and after 076aa2cbd (tempfile: auto-allocate tempfiles on heap, 2017-09-05), we can have lockfiles on the stack. Signed-off-by: Martin Ågren <martin.agren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Martin Ågren committed Oct 5, 2017 at 22:32 UTC 02ae242fdde2ba8acb6b87e32df2b1e33786e78b

1 file changed +3 -5

builtin/checkout-index.c

+3 -5

@@ -129,8 +129,6 @@ static const char * const builtin_checkout_index_usage[] = {

129 NULL

130 };

131

132 -static struct lock_file lock_file;

133 -

132 static int option_parse_stage(const struct option *opt,

133 const char *arg, int unset)

134 {

@@ -150,7 +148,7 @@ static int option_parse_stage(const struct option *opt,

148 int cmd_checkout_index(int argc, const char **argv, const char *prefix)

149 {

150 int i;

153 - int newfd = -1;

151 + struct lock_file lock_file = LOCK_INIT;

152 int all = 0;

153 int read_from_stdin = 0;

154 int prefix_length;

@@ -206,7 +204,7 @@ int cmd_checkout_index(int argc, const char **argv, const char *prefix)

204 if (index_opt && !state.base_dir_len && !to_tempfile) {

205 state.refresh_cache = 1;

206 state.istate = &the_index;

209 - newfd = hold_locked_index(&lock_file, LOCK_DIE_ON_ERROR);

207 + hold_locked_index(&lock_file, LOCK_DIE_ON_ERROR);

208 }

209

210 /* Check out named files first */

@@ -251,7 +249,7 @@ int cmd_checkout_index(int argc, const char **argv, const char *prefix)

249 if (all)

250 checkout_all(prefix, prefix_length);

251

254 - if (0 <= newfd &&

252 + if (is_lock_file_locked(&lock_file) &&

253 write_locked_index(&the_index, &lock_file, COMMIT_LOCK))

254 die("Unable to write new index file");

255 return 0;