diff options
Diffstat (limited to 'wt-status.c')
| -rw-r--r-- | wt-status.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/wt-status.c b/wt-status.c index 6f730ee8f2..7d88e7ca85 100644 --- a/wt-status.c +++ b/wt-status.c @@ -2299,14 +2299,14 @@ int has_uncommitted_changes(int ignore_submodules) */ int require_clean_work_tree(const char *action, const char *hint, int ignore_submodules, int gently) { - struct lock_file *lock_file = xcalloc(1, sizeof(*lock_file)); + struct lock_file lock_file = LOCK_INIT; int err = 0, fd; - fd = hold_locked_index(lock_file, 0); + fd = hold_locked_index(&lock_file, 0); refresh_cache(REFRESH_QUIET); if (0 <= fd) - update_index_if_able(&the_index, lock_file); - rollback_lock_file(lock_file); + update_index_if_able(&the_index, &lock_file); + rollback_lock_file(&lock_file); if (has_unstaged_changes(ignore_submodules)) { /* TRANSLATORS: the action is e.g. "pull with rebase" */ |