Merge branch 'js/prepare-sequencer'

gitster · gitster · commit 7f1dc9f4cb76 · 2016-11-22T14:15:38.000-08:00
Fix for an error message string.

* js/prepare-sequencer:
  i18n: fix unmatched single quote in error message
diff --git a/sequencer.c b/sequencer.c
@@ -248,7 +248,7 @@ static int write_message(const void *buf, size_t len, const char *filename,
 	}
 	if (append_eol && write(msg_fd, "\n", 1) < 0) {
 		rollback_lock_file(&msg_file);
-		return error_errno(_("could not write eol to '%s"), filename);
+		return error_errno(_("could not write eol to '%s'"), filename);
 	}
 	if (commit_lock_file(&msg_file) < 0) {
 		rollback_lock_file(&msg_file);

Original file line number	Diff line number	Diff line change
`@@ -248,7 +248,7 @@ static int write_message(const void buf, size_t len, const char filename,`
`248`	`248`	`}`
`249`	`249`	`if (append_eol && write(msg_fd, "\n", 1) < 0) {`
`250`	`250`	`rollback_lock_file(&msg_file);`
`251`		`- return error_errno(_("could not write eol to '%s"), filename);`
	`251`	`+ return error_errno(_("could not write eol to '%s'"), filename);`
`252`	`252`	`}`
`253`	`253`	`if (commit_lock_file(&msg_file) < 0) {`
`254`	`254`	`rollback_lock_file(&msg_file);`