diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-11-02 13:17:44 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-11-02 13:17:44 -0800 |
| commit | f3e63abb279dbd501459169b1156ea78765e3d3e (patch) | |
| tree | 15d6671576219ed58190c8d225146fc6ba12130c | |
| parent | Merge branch 'mk/diff-ignore-regex' (diff) | |
| parent | sequencer: remove duplicate rollback_lock_file() call (diff) | |
| download | tgif-f3e63abb279dbd501459169b1156ea78765e3d3e.tar.xz | |
Merge branch 'en/sequencer-rollback-lock-cleanup'
Code clean-up.
* en/sequencer-rollback-lock-cleanup:
sequencer: remove duplicate rollback_lock_file() call
| -rw-r--r-- | sequencer.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sequencer.c b/sequencer.c index c358100299..a65d7a6b7c 100644 --- a/sequencer.c +++ b/sequencer.c @@ -3691,7 +3691,6 @@ static int do_merge(struct repository *r, NULL, 0); rollback_lock_file(&lock); - rollback_lock_file(&lock); ret = run_command(&cmd); /* force re-reading of the cache */ |