[PATCH v5 21/35] dump_marks(): remove a redundant call to rollback_lock_file()

[Michael Haggerty]

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 mhag...@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

--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v5 21/35] dump_marks(): remove a redundant call to rollback_lock_file()

[Jonathan Nieder]

Michael Haggerty wrote:

 Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
 ---
  fast-import.c | 4 +---
  1 file changed, 1 insertion(+), 3 deletions(-)

Reviewed-by: Jonathan Nieder jrnie...@gmail.com
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html