diff options
| author |  Michael Haggerty <mhagger@alum.mit.edu> | 2014-10-01 12:28:25 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2014-10-01 13:48:59 -0700 |
| commit | 32c3ec258e8b12ba29ce591b09a300621dba9b3a (patch) | |
| tree | ee59729fba7d3efc1b89b11bff3efef6e68a2182 | |
| parent | api-lockfile: document edge cases (diff) | |
| download | tgif-32c3ec258e8b12ba29ce591b09a300621dba9b3a.tar.xz | |
dump_marks(): remove a redundant call to rollback_lock_file()
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>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | fast-import.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fast-import.c b/fast-import.c index 96b0f4236a..783c6840b5 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; } } |