t7501: add test of "commit --dry-run --short"

diff --git a/sha1-lookup.c b/sha1-lookup.c
index 4cf3ebd9212f6d5c9b9829373e58c34b83f0a548..796ab68da83c3a36ec87fa45bfa18f5d0508a947 100644 (file)
--- a/sha1-lookup.c
+++ b/sha1-lookup.c
@@ -81,7 +81,7 @@ int sha1_pos(const unsigned char *sha1, void *table, size_t nr,
                                mi = (nr - 1) * (miv - lov) / (hiv - lov);
                                if (lo <= mi && mi < hi)
                                        break;
-                               die("BUG: assertion failed in binary search");
+                               BUG("assertion failed in binary search");
                        }
                }
        }
@@ -99,3 +99,31 @@ int sha1_pos(const unsigned char *sha1, void *table, size_t nr,
        } while (lo < hi);
        return -lo-1;
 }
+
+int bsearch_hash(const unsigned char *sha1, const uint32_t *fanout_nbo,
+                const unsigned char *table, size_t stride, uint32_t *result)
+{
+       uint32_t hi, lo;
+
+       hi = ntohl(fanout_nbo[*sha1]);
+       lo = ((*sha1 == 0x0) ? 0 : ntohl(fanout_nbo[*sha1 - 1]));
+
+       while (lo < hi) {
+               unsigned mi = lo + (hi - lo) / 2;
+               int cmp = hashcmp(table + mi * stride, sha1);
+
+               if (!cmp) {
+                       if (result)
+                               *result = mi;
+                       return 1;
+               }
+               if (cmp > 0)
+                       hi = mi;
+               else
+                       lo = mi + 1;
+       }
+
+       if (result)
+               *result = lo;
+       return 0;
+}