summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Haggerty <mhagger@alum.mit.edu>2014-10-01 10:28:25 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-10-01 20:48:59 (GMT)
commit32c3ec258e8b12ba29ce591b09a300621dba9b3a (patch)
treeee59729fba7d3efc1b89b11bff3efef6e68a2182
parentd75145acf6d17eb9b0f9d7d8856e523038081311 (diff)
downloadgit-32c3ec258e8b12ba29ce591b09a300621dba9b3a.zip
git-32c3ec258e8b12ba29ce591b09a300621dba9b3a.tar.gz
git-32c3ec258e8b12ba29ce591b09a300621dba9b3a.tar.bz2
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.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/fast-import.c b/fast-import.c
index 96b0f42..783c684 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;
}
}