summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar James Bowes <jbowes@dangerouslyinc.com>2007-05-29 19:29:51 -0400
committerLibravatar Junio C Hamano <junkio@cox.net>2007-05-29 17:53:44 -0700
commit1055880e7c096907ac87203dd83fdc6830251115 (patch)
tree65e78da0fc62b4a9420e04a11508dd7b3158711f
parentAttempt to delay prepare_alt_odb during get_sha1 (diff)
downloadtgif-1055880e7c096907ac87203dd83fdc6830251115.tar.xz
rev-parse: Identify short sha1 sums correctly.
find_short_packed_object was not loading the pack index files. Teach it to do so. Signed-off-by: James Bowes <jbowes@dangerouslyinc.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--sha1_name.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/sha1_name.c b/sha1_name.c
index 8dfceb2d7f..7df01af788 100644
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -76,8 +76,11 @@ static int find_short_packed_object(int len, const unsigned char *match, unsigne
prepare_packed_git();
for (p = packed_git; p && found < 2; p = p->next) {
- uint32_t num = p->num_objects;
- uint32_t first = 0, last = num;
+ uint32_t num, last;
+ uint32_t first = 0;
+ open_pack_index(p);
+ num = p->num_objects;
+ last = num;
while (first < last) {
uint32_t mid = (first + last) / 2;
const unsigned char *now;