From: Michael Haggerty <mhagger@alum.mit.edu>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jeff King <peff@peff.net>, Philip Oakley <philipoakley@iee.org>,
git@vger.kernel.org, Michael Haggerty <mhagger@alum.mit.edu>
Subject: [PATCH v3 06/14] filter_refs(): do not check the same sought_pos twice
Date: Sun, 9 Sep 2012 08:19:41 +0200 [thread overview]
Message-ID: <1347171589-13327-7-git-send-email-mhagger@alum.mit.edu> (raw)
In-Reply-To: <1347171589-13327-1-git-send-email-mhagger@alum.mit.edu>
Once a match has been found at sought_pos, the entry is zeroed and no
future attempts will match that entry. So increment sought_pos to
avoid checking against the zeroed-out entry during the next iteration.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
---
builtin/fetch-pack.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/fetch-pack.c b/builtin/fetch-pack.c
index df81995..63d455f 100644
--- a/builtin/fetch-pack.c
+++ b/builtin/fetch-pack.c
@@ -565,8 +565,8 @@ static void filter_refs(struct ref **refs, struct string_list *sought)
if (cmp < 0) /* definitely do not have it */
break;
else if (cmp == 0) { /* definitely have it */
- sought->items[sought_pos].string[0] = '\0';
return_refs[sought_pos] = ref;
+ sought->items[sought_pos++].string[0] = '\0';
break;
}
else /* might have it; keep looking */
--
1.7.11.3
next prev parent reply other threads:[~2012-09-09 6:21 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-09 6:19 [PATCH v3 00/14] Clean up how fetch_pack() handles the heads list Michael Haggerty
2012-09-09 6:19 ` [PATCH v3 01/14] t5500: add tests of error output for missing refs Michael Haggerty
2012-09-09 6:19 ` [PATCH v3 02/14] t5500: add tests of fetch-pack --all --depth=N $URL $REF Michael Haggerty
2012-09-10 20:46 ` Junio C Hamano
2012-09-10 21:53 ` Michael Haggerty
2012-09-18 23:37 ` Philip Oakley
2012-09-09 6:19 ` [PATCH v3 03/14] Rename static function fetch_pack() to http_fetch_pack() Michael Haggerty
2012-09-09 6:19 ` [PATCH v3 04/14] fetch_pack(): reindent function decl and defn Michael Haggerty
2012-09-09 6:19 ` [PATCH v3 05/14] Change fetch_pack() and friends to take string_list arguments Michael Haggerty
2012-09-10 20:56 ` Junio C Hamano
2012-09-17 12:24 ` Michael Haggerty
2012-09-17 22:10 ` Junio C Hamano
2012-09-17 22:17 ` Jeff King
2012-09-18 20:49 ` Junio C Hamano
2012-09-09 6:19 ` Michael Haggerty [this message]
2012-09-09 6:19 ` [PATCH v3 07/14] fetch_pack(): update sought->nr to reflect number of unique entries Michael Haggerty
2012-09-09 6:19 ` [PATCH v3 08/14] filter_refs(): delete matched refs from sought list Michael Haggerty
2012-09-09 6:19 ` [PATCH v3 09/14] filter_refs(): build refs list as we go Michael Haggerty
2012-09-10 21:18 ` Junio C Hamano
2012-09-09 6:19 ` [PATCH v3 10/14] filter_refs(): simplify logic Michael Haggerty
2012-09-09 6:19 ` [PATCH v3 11/14] cmd_fetch_pack(): return early if finish_connect() fails Michael Haggerty
2012-09-09 6:19 ` [PATCH v3 12/14] fetch-pack: report missing refs even if no existing refs were received Michael Haggerty
2012-09-09 6:19 ` [PATCH v3 13/14] cmd_fetch_pack(): simplify computation of return value Michael Haggerty
2012-09-09 6:19 ` [PATCH v3 14/14] fetch-pack: eliminate spurious error messages Michael Haggerty
2012-09-09 10:20 ` [PATCH v3 00/14] Clean up how fetch_pack() handles the heads list Junio C Hamano
2012-09-09 13:05 ` Jeff King
2012-09-09 18:15 ` Junio C Hamano
2012-09-10 21:59 ` Michael Haggerty
2012-09-10 22:10 ` Junio C Hamano
2012-09-17 12:55 ` Michael Haggerty
2012-09-17 20:39 ` Junio C Hamano
2012-09-10 21:21 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1347171589-13327-7-git-send-email-mhagger@alum.mit.edu \
--to=mhagger@alum.mit.edu \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--cc=philipoakley@iee.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).