From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 22 Nov 2016 22:15:38 +0000 (-0800)
Subject: Merge branch 'js/prepare-sequencer'
X-Git-Tag: v2.11.0-rc3~6
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/7f1dc9f4cb760e4be9bad64e5a1af9ad42fb7f79?ds=inline;hp=-c

Merge branch 'js/prepare-sequencer'

Fix for an error message string.

* js/prepare-sequencer:
i18n: fix unmatched single quote in error message
---

7f1dc9f4cb760e4be9bad64e5a1af9ad42fb7f79
diff --combined sequencer.c
index 6f0ff9e413,c3bb0e6567..30b10ba143
--- a/sequencer.c
+++ b/sequencer.c
@@@ -248,7 -248,7 +248,7 @@@ static int write_message(const void *bu
  	}
  	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);
@@@ -658,7 -658,7 +658,7 @@@ static int do_pick_commit(enum todo_com
  		unborn = get_sha1("HEAD", head);
  		if (unborn)
  			hashcpy(head, EMPTY_TREE_SHA1_BIN);
 -		if (index_differs_from(unborn ? EMPTY_TREE_SHA1_HEX : "HEAD", 0))
 +		if (index_differs_from(unborn ? EMPTY_TREE_SHA1_HEX : "HEAD", 0, 0))
  			return error_dirty_index(opts);
  	}
  	discard_cache();
@@@ -1312,7 -1312,7 +1312,7 @@@ int sequencer_continue(struct replay_op
  		if (res)
  			goto release_todo_list;
  	}
 -	if (index_differs_from("HEAD", 0)) {
 +	if (index_differs_from("HEAD", 0, 0)) {
  		res = error_dirty_index(opts);
  		goto release_todo_list;
  	}