aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2023-04-04 14:28:28 -0700
committerJunio C Hamano <gitster@pobox.com>2023-04-04 14:28:28 -0700
commit0ee87cde28e5cd5c06fdb70e4a7dde364ee71a68 (patch)
tree1ad3f2b6bca92f822e568bbb7b1b184a97ce756e
parentMerge branch 'jk/blame-contents-with-arbitrary-commit' (diff)
parentsequencer: remove pointless rollback_lock_file() (diff)
downloadgit-0ee87cde28e5cd5c06fdb70e4a7dde364ee71a68.tar.gz
git-0ee87cde28e5cd5c06fdb70e4a7dde364ee71a68.zip
Merge branch 'ob/rollback-after-commit-lock-failure'
Code clean-up. * ob/rollback-after-commit-lock-failure: sequencer: remove pointless rollback_lock_file()
-rw-r--r--sequencer.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/sequencer.c b/sequencer.c
index 3be23d7ca2..2da9b9f890 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -3676,7 +3676,6 @@ static int safe_append(const char *filename, const char *fmt, ...)
}
if (commit_lock_file(&lock) < 0) {
strbuf_release(&buf);
- rollback_lock_file(&lock);
return error(_("failed to finalize '%s'"), filename);
}