From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 11 Nov 2016 21:56:30 +0000 (-0800)
Subject: Merge branch 'js/prepare-sequencer'
X-Git-Tag: v2.11.0-rc1~5
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/5de732f647609de15f51e98b9c9de07115b58b5c?hp=-c

Merge branch 'js/prepare-sequencer'

Silence a clang warning introduced by a recently graduated topic.

* js/prepare-sequencer:
sequencer: silence -Wtautological-constant-out-of-range-compare
---

5de732f647609de15f51e98b9c9de07115b58b5c
diff --combined sequencer.c
index 5fd75f30dd,fae2bbd2ba..6f0ff9e413
--- a/sequencer.c
+++ b/sequencer.c
@@@ -629,7 -629,7 +629,7 @@@ static const char *todo_command_strings
  
  static const char *command_to_string(const enum todo_command command)
  {
- 	if (command < ARRAY_SIZE(todo_command_strings))
+ 	if ((size_t)command < ARRAY_SIZE(todo_command_strings))
  		return todo_command_strings[command];
  	die("Unknown command: %d", command);
  }
@@@ -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;
  	}