global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-09 17:46:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

apply: remove newfd from struct apply_state

Browse Source 
Similar to a previous patch, we do not need to use `newfd` to signal
that we have a lockfile to clean up. We can just unconditionally call
`rollback_lock_file`. If we do not hold the lock, it will be a no-op.

Where we check `newfd` to decide whether we need to take the lock, we
can instead use `is_lock_file_locked()`.

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
2017-10-05 22:32:10 +02:00
committed by Junio C Hamano
parent 6d058c8826
commit d13cd4c927
2 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apply.h
View File

@@ -36,9 +36,8 @@ enum apply_verbosity {
struct apply_state {
const char *prefix;
/* These are lock_file related */
/* Lock file */
struct lock_file lock_file;
int newfd;
/* These control what gets looked at and modified */
int apply; /* this is not a dry-run */