aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-04-12 16:46:41 -0700
committerJunio C Hamano <gitster@pobox.com>2009-04-12 16:46:41 -0700
commit07fb030efc7fd3d1833b53880dd39e98033326f6 (patch)
treeb45e911686a3cdf2cac4695cb590308117dd397b
parent6e353a5e5de9da021c7c6c0bc2dc5f95a39900a1 (diff)
parent1a7b1f6b9c9a129236c66c392877e8697825470f (diff)
downloadgit-07fb030efc7fd3d1833b53880dd39e98033326f6.tar.gz
git-07fb030efc7fd3d1833b53880dd39e98033326f6.tar.xz
Merge branch 'cc/sha1-bsearch'
* cc/sha1-bsearch: sha1-lookup: fix up the assertion message
-rw-r--r--sha1-lookup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sha1-lookup.c b/sha1-lookup.c
index 055dd87dc..c4dc55d1f 100644
--- 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("oops");
+ die("BUG: assertion failed in binary search");
}
}
if (18 <= ofs)