diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-12-11 11:14:18 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-12-11 11:14:18 -0800 |
| commit | abca668a93f0039c8c3fe81a6625fcdf81c35bdf (patch) | |
| tree | 4c76311689c4e2f16694cf4cf2f7ee29cd4b54a8 /fast-import.c | |
| parent | 76058817e80725a2fd1f4935289f663b7aefc024 (diff) | |
| parent | 08a3651fe7f3163acbac461e0daf370329a1d332 (diff) | |
| download | git-abca668a93f0039c8c3fe81a6625fcdf81c35bdf.tar.gz git-abca668a93f0039c8c3fe81a6625fcdf81c35bdf.tar.xz | |
Merge branch 'sg/lock-file-commit-error' into maint
Cosmetic improvement to lock-file error messages.
* sg/lock-file-commit-error:
Make error message after failing commit_lock_file() less confusing
Diffstat (limited to 'fast-import.c')
| -rw-r--r-- | fast-import.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fast-import.c b/fast-import.c index 6c7c3c9b6..b141535e1 100644 --- a/fast-import.c +++ b/fast-import.c @@ -1821,7 +1821,7 @@ static void dump_marks(void) dump_marks_helper(f, 0, marks); if (commit_lock_file(&mark_lock)) { - failure |= error("Unable to commit marks file %s: %s", + failure |= error("Unable to write file %s: %s", export_marks_file, strerror(errno)); return; } |