diff options
Diffstat (limited to 'fast-import.c')
| -rw-r--r-- | fast-import.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fast-import.c b/fast-import.c index 96b0f4236a..deadc33f94 100644 --- a/fast-import.c +++ b/fast-import.c @@ -153,6 +153,7 @@ Format of STDIN stream: #include "builtin.h" #include "cache.h" +#include "lockfile.h" #include "object.h" #include "blob.h" #include "tree.h" @@ -1832,10 +1833,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; } } |