mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'en/sequencer-rollback-lock-cleanup'

Browse Source 
Code clean-up.

* en/sequencer-rollback-lock-cleanup:
  sequencer: remove duplicate rollback_lock_file() call
This commit is contained in:
Junio C Hamano
2020-11-02 13:17:44 -08:00
parent 1ae0949a03 9a82db1056
commit f3e63abb27
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sequencer.c
View File

@ -3691,7 +3691,6 @@ static int do_merge(struct repository *r,
NULL, 0); NULL, 0);
rollback_lock_file(&lock); rollback_lock_file(&lock);
rollback_lock_file(&lock);
ret = run_command(&cmd); ret = run_command(&cmd);
/* force re-reading of the cache */ /* force re-reading of the cache */