summaryrefslogtreecommitdiff
path: root/fast-import.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-12-11 11:14:18 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-12-11 11:14:18 -0800
commitabca668a93f0039c8c3fe81a6625fcdf81c35bdf (patch)
tree4c76311689c4e2f16694cf4cf2f7ee29cd4b54a8 /fast-import.c
parentMerge branch 'cb/t3404-shellquote' into maint (diff)
parentMake error message after failing commit_lock_file() less confusing (diff)
downloadtgif-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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fast-import.c b/fast-import.c
index 6c7c3c9b66..b141535e11 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;
}