diff options
author | Martin Ågren <martin.agren@gmail.com> | 2018-02-28 22:07:58 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-02-28 22:15:51 +0300 |
commit | 350292a1efb38bbcd6255a424df6adbfe78910ac (patch) | |
tree | 5bd9c1233580c2d2bfffcfcacebf8906ab3fb0d9 /merge-recursive.c | |
parent | 5790d25881a60a1c3a780e997a59774e48c2c026 (diff) |
sequencer: do not roll back lockfile unnecessarily
If `commit_lock_file()` or `hold_lock_file_for_update()` fail, there is
no need to call `rollback_lock_file()` on the lockfile. It doesn't hurt
either, but it does make different callers in this file inconsistent,
which might be confusing.
While at it, remove a trailing '.' from a recurring error message.
Signed-off-by: Martin Ågren <martin.agren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions