diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-10-15 04:48:00 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-10-15 04:48:00 (GMT) |
| commit | 6d5291be450594d453759650f466174f39953c4f (patch) | |
| tree | bc8f0616f6748e59e43105c78f5c4505565ab76d /sha1-lookup.c | |
| parent | ccc289915af00b44346cbf007f4f82ec2131f1a1 (diff) | |
| parent | 46689317ac009ef4ae91235354b6df7bf6d11d17 (diff) | |
| download | git-6d5291be450594d453759650f466174f39953c4f.zip git-6d5291be450594d453759650f466174f39953c4f.tar.gz git-6d5291be450594d453759650f466174f39953c4f.tar.bz2 | |
Merge branch 'js/azure-pipelines-msvc'
CI updates.
* js/azure-pipelines-msvc:
ci: also build and test with MS Visual Studio on Azure Pipelines
ci: really use shallow clones on Azure Pipelines
tests: let --immediate and --write-junit-xml play well together
test-tool run-command: learn to run (parts of) the testsuite
vcxproj: include more generated files
vcxproj: only copy `git-remote-http.exe` once it was built
msvc: work around a bug in GetEnvironmentVariable()
msvc: handle DEVELOPER=1
msvc: ignore some libraries when linking
compat/win32/path-utils.h: add #include guards
winansi: use FLEX_ARRAY to avoid compiler warning
msvc: avoid using minus operator on unsigned types
push: do not pretend to return `int` from `die_push_simple()`
Diffstat (limited to 'sha1-lookup.c')
| -rw-r--r-- | sha1-lookup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sha1-lookup.c b/sha1-lookup.c index 93d9af0..2918584 100644 --- a/sha1-lookup.c +++ b/sha1-lookup.c @@ -70,7 +70,7 @@ int sha1_pos(const unsigned char *hash, void *table, size_t nr, if (miv < lov) return -1; if (hiv < miv) - return -1 - nr; + return index_pos_to_insert_pos(nr); if (lov != hiv) { /* * At this point miv could be equal @@ -97,7 +97,7 @@ int sha1_pos(const unsigned char *hash, void *table, size_t nr, lo = mi + 1; mi = lo + (hi - lo) / 2; } while (lo < hi); - return -lo-1; + return index_pos_to_insert_pos(lo); } int bsearch_hash(const unsigned char *sha1, const uint32_t *fanout_nbo, |