Merge branch 'bc/hash-algo' into maint

diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index 26828c1d82bc9a997041cb464d4a3fde38e2d19d..4c51aec81f374d52e7c6a1afa73ab9dea3cf40b8 100644 (file)
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -12,6 +12,7 @@
 #include "exec_cmd.h"
 #include "streaming.h"
 #include "thread-utils.h"
+#include "packfile.h"
 
 static const char index_pack_usage[] =
 "git index-pack [-v] [-o <index-file>] [--keep | --keep=<msg>] [--verify] [--strict] (<pack-file> | --stdin [--fix-thin] [<pack-file>])";
@@ -632,7 +633,7 @@ static int find_ofs_delta(const off_t offset, enum object_type type)
        int first = 0, last = nr_ofs_deltas;
 
        while (first < last) {
-               int next = (first + last) / 2;
+               int next = first + (last - first) / 2;
                struct ofs_delta_entry *delta = &ofs_deltas[next];
                int cmp;
 
@@ -686,7 +687,7 @@ static int find_ref_delta(const unsigned char *sha1, enum object_type type)
        int first = 0, last = nr_ref_deltas;
 
        while (first < last) {
-               int next = (first + last) / 2;
+               int next = first + (last - first) / 2;
                struct ref_delta_entry *delta = &ref_deltas[next];
                int cmp;
 
@@ -1659,10 +1660,7 @@ int cmd_index_pack(int argc, const char **argv, const char *prefix)
                                from_stdin = 1;
                        } else if (!strcmp(arg, "--fix-thin")) {
                                fix_thin_pack = 1;
-                       } else if (!strcmp(arg, "--strict")) {
-                               strict = 1;
-                               do_fsck_object = 1;
-                       } else if (skip_prefix(arg, "--strict=", &arg)) {
+                       } else if (skip_to_optional_arg(arg, "--strict", &arg)) {
                                strict = 1;
                                do_fsck_object = 1;
                                fsck_set_msg_types(&fsck_options, arg);
@@ -1678,10 +1676,8 @@ int cmd_index_pack(int argc, const char **argv, const char *prefix)
                                verify = 1;
                                show_stat = 1;
                                stat_only = 1;
-                       } else if (!strcmp(arg, "--keep")) {
-                               keep_msg = "";
-                       } else if (starts_with(arg, "--keep=")) {
-                               keep_msg = arg + 7;
+                       } else if (skip_to_optional_arg(arg, "--keep", &keep_msg)) {
+                               ; /* nothing to do */
                        } else if (starts_with(arg, "--threads=")) {
                                char *end;
                                nr_threads = strtoul(arg+10, &end, 0);