[PATCH v5 21/35] dump_marks(): remove a redundant call to rollback_lock_file()
- From
Michael Haggerty <mhagger@alum.mit.edu>
- Date
- Sep 16, 2014, 19:33 UTC
- Message-ID
- <1410896036-12750-22-git-send-email-mhagger@alum.mit.edu>
- In-Reply-To
- <1410896036-12750-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 <mhagger@alum.mit.edu> --- fast-import.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/fast-import.c b/fast-import.c index c071253..742d4d7 100644 --- a/fast-import.c +++ b/fast-import.c @@ -1828,10 +1828,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