Merge branch 'js/prepare-sequencer'
authorJunio C Hamano <gitster@pobox.com>
Tue, 22 Nov 2016 22:15:38 +0000 (14:15 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 22 Nov 2016 22:15:38 +0000 (14:15 -0800)
Fix for an error message string.

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

1  2 
sequencer.c
diff --combined sequencer.c
index 6f0ff9e413129567332b78bd93ff2528076c8db6,c3bb0e6567985f216935690621876bcfd1ba73d5..30b10ba143959bf2618872427f730a9f0e30d369
@@@ -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;
        }