summaryrefslogtreecommitdiff
path: root/fast-import.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-12-11 10:40:54 -0800
committerJunio C Hamano <gitster@pobox.com>2015-12-11 10:40:55 -0800
commite0048d3e0d95dca049423b17b97e27fef1d0da5a (patch)
treee0bfd398f949ea7f0c1eb8fc91e25eb9eba38fac /fast-import.c
parent7d722536dd86b5fbd0c0434bfcea5588132ee6ad (diff)
parent08a3651fe7f3163acbac461e0daf370329a1d332 (diff)
downloadgit-e0048d3e0d95dca049423b17b97e27fef1d0da5a.tar.gz
Merge branch 'sg/lock-file-commit-error'
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 e3b421d514..3c65edb5c4 100644
--- a/fast-import.c
+++ b/fast-import.c
@@ -1824,7 +1824,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;
}