|
1 | 1 | #define USE_THE_REPOSITORY_VARIABLE |
2 | | -#define DISABLE_SIGN_COMPARE_WARNINGS |
| 2 | + |
3 | 3 |
|
4 | 4 | #include "builtin.h" |
5 | 5 | #include "copy.h" |
@@ -694,9 +694,10 @@ static enum bisect_error bisect_auto_next(struct bisect_terms *terms, const char |
694 | 694 | static enum bisect_error bisect_start(struct bisect_terms *terms, int argc, |
695 | 695 | const char **argv) |
696 | 696 | { |
| 697 | + int i; |
697 | 698 | int no_checkout = 0; |
698 | 699 | int first_parent_only = 0; |
699 | | - int i, has_double_dash = 0, must_write_terms = 0, bad_seen = 0; |
| 700 | + int has_double_dash = 0, must_write_terms = 0, bad_seen = 0; |
700 | 701 | int flags, pathspec_pos; |
701 | 702 | enum bisect_error res = BISECT_OK; |
702 | 703 | struct string_list revs = STRING_LIST_INIT_DUP; |
@@ -775,7 +776,7 @@ static enum bisect_error bisect_start(struct bisect_terms *terms, int argc, |
775 | 776 | */ |
776 | 777 | if (revs.nr) |
777 | 778 | must_write_terms = 1; |
778 | | - for (i = 0; i < revs.nr; i++) { |
| 779 | + for (i = 0; i < (int)revs.nr; i++) { |
779 | 780 | if (bad_seen) { |
780 | 781 | string_list_append(&states, terms->term_good); |
781 | 782 | } else { |
@@ -858,7 +859,7 @@ static enum bisect_error bisect_start(struct bisect_terms *terms, int argc, |
858 | 859 | sq_quote_argv(&bisect_names, argv + pathspec_pos); |
859 | 860 | write_file(git_path_bisect_names(), "%s\n", bisect_names.buf); |
860 | 861 |
|
861 | | - for (i = 0; i < states.nr; i++) |
| 862 | + for (i = 0; i < (int)states.nr; i++) |
862 | 863 | if (bisect_write(states.items[i].string, |
863 | 864 | revs.items[i].string, terms, 1)) { |
864 | 865 | res = BISECT_FAILED; |
@@ -924,8 +925,9 @@ static int bisect_autostart(struct bisect_terms *terms) |
924 | 925 | static enum bisect_error bisect_state(struct bisect_terms *terms, int argc, |
925 | 926 | const char **argv) |
926 | 927 | { |
| 928 | + int i; |
927 | 929 | const char *state; |
928 | | - int i, verify_expected = 1; |
| 930 | + int verify_expected = 1; |
929 | 931 | struct object_id oid, expected; |
930 | 932 | struct oid_array revs = OID_ARRAY_INIT; |
931 | 933 |
|
@@ -984,7 +986,7 @@ static enum bisect_error bisect_state(struct bisect_terms *terms, int argc, |
984 | 986 | if (refs_read_ref(get_main_ref_store(the_repository), "BISECT_EXPECTED_REV", &expected)) |
985 | 987 | verify_expected = 0; /* Ignore invalid file contents */ |
986 | 988 |
|
987 | | - for (i = 0; i < revs.nr; i++) { |
| 989 | + for (i = 0; i < (int)revs.nr; i++) { |
988 | 990 | if (bisect_write(state, oid_to_hex(&revs.oid[i]), terms, 0)) { |
989 | 991 | oid_array_clear(&revs); |
990 | 992 | return BISECT_FAILED; |
|
0 commit comments