mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-10 12:16:12 +02:00
Code

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>
This commit is contained in:
Michael Haggerty 2014-10-01 12:28:25 +02:00 committed by Junio C Hamano
parent d75145acf6
commit 32c3ec258e
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fast-import.c
View File

@ -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;
}
}