threads / patch / 8352

patchrev-parse: Identify short sha1 sums correctly.

Subject: [PATCH] rev-parse: Identify short sha1 sums correctly.

## tl;dr

3 messages between May 29, 2007 and May 30, 2007. Diffs are folded; open one to read it.

replies: 2people: 2as markdown or json

James Bowes· May 29, 2007, 23:29 UTC · lore

find_short_packed_object was not loading the pack index files. Teach it to do so.

Signed-off-by: James Bowes <jbowes@dangerouslyinc.com>
---
 sha1_name.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
Show changes to sha1_name.c +5 −2
diff --git a/sha1_name.c b/sha1_name.c
index 8dfceb2..7df01af 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;

-- 
1.5.2.869.g6b3ba
Junio C Hamano· May 30, 2007, 00:53 UTC · re: James Bowes · lore

Re: [PATCH] rev-parse: Identify short sha1 sums correctly.

Thanks, James.

This seems to fix the bug I mentioned about 'next' in the last "What's cooking" message. Also I have been seeing a segfault from rev-parse in t5500 (rev-parse --short hits the same issue, because the bug caused object name not to be abreviated) but that is also fixed with this patch.

Will apply, instead of reverting the "lazy index loading".
James Bowes· May 30, 2007, 01:09 UTC · re: Junio C Hamano · lore

Re: [PATCH] rev-parse: Identify short sha1 sums correctly.

On 5/29/07, Junio C Hamano <junkio@cox.net> wrote:
> Thanks, James.
Glad to help when I can.
Show 10 quoted lines
> This seems to fix the bug I mentioned about 'next' in the last
> "What's cooking" message.  Also I have been seeing a segfault
> from rev-parse in t5500 (rev-parse --short hits the same issue,
> because the bug caused object name not to be abreviated) but
> that is also fixed with this patch.
>
> Will apply, instead of reverting the "lazy index loading".
>
>
>
-James

← back to recent threads