From: Michael Haggerty Date: Fri, 26 Sep 2014 10:08:22 GMT Subject: [PATCH v6 22/39] dump_marks(): remove a redundant call to rollback_lock_file() Message-ID: <1411726119-31598-23-git-send-email-mhagger@alum.mit.edu> In-Reply-To: <1411726119-31598-1-git-send-email-mhagger@alum.mit.edu> When commit_lock_file() fails, it now always calls rollback_lock_file() internally, so there is no need to call that function here. Signed-off-by: Michael Haggerty Reviewed-by: Jonathan Nieder --- fast-import.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/fast-import.c b/fast-import.c index 487f1f8..61ac7e0 100644 --- a/fast-import.c +++ b/fast-import.c @@ -1832,10 +1832,8 @@ static void dump_marks(void) } if (commit_lock_file(&mark_lock)) { - int saved_errno = errno; - rollback_lock_file(&mark_lock); failure |= error("Unable to commit marks file %s: %s", - export_marks_file, strerror(saved_errno)); + export_marks_file, strerror(errno)); return; } } -- 2.1.0