From: mhagger@alum.mit.edu
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Jeff King <peff@peff.net>,
Jakub Narebski <jnareb@gmail.com>,
Heiko Voigt <hvoigt@hvoigt.net>,
Johan Herland <johan@herland.net>,
Michael Haggerty <mhagger@alum.mit.edu>
Subject: [PATCH 4/7] fetch-pack.c: inline insert_alternate_refs()
Date: Sat, 11 Feb 2012 07:20:58 +0100 [thread overview]
Message-ID: <1328941261-29746-5-git-send-email-mhagger@alum.mit.edu> (raw)
In-Reply-To: <1328941261-29746-1-git-send-email-mhagger@alum.mit.edu>
From: Michael Haggerty <mhagger@alum.mit.edu>
The logic of the (single) caller is clearer without encapsulating this
one line in a function.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
---
builtin/fetch-pack.c | 7 +------
1 files changed, 1 insertions(+), 6 deletions(-)
diff --git a/builtin/fetch-pack.c b/builtin/fetch-pack.c
index 9bd2096..dbe9acb 100644
--- a/builtin/fetch-pack.c
+++ b/builtin/fetch-pack.c
@@ -256,11 +256,6 @@ static void insert_one_alternate_ref(const struct ref *ref, void *unused)
rev_list_insert_ref(NULL, ref->old_sha1, 0, NULL);
}
-static void insert_alternate_refs(void)
-{
- for_each_alternate_ref(insert_one_alternate_ref, NULL);
-}
-
#define INITIAL_FLUSH 16
#define PIPESAFE_FLUSH 32
#define LARGE_FLUSH 1024
@@ -295,7 +290,7 @@ static int find_common(int fd[2], unsigned char *result_sha1,
marked = 1;
for_each_ref(rev_list_insert_ref, NULL);
- insert_alternate_refs();
+ for_each_alternate_ref(insert_one_alternate_ref, NULL);
fetching = 0;
for ( ; refs ; refs = refs->next) {
--
1.7.9
next prev parent reply other threads:[~2012-02-11 6:21 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-11 6:20 [PATCH 0/7] Make alternates affect fetch behavior mhagger
2012-02-11 6:20 ` [PATCH 1/7] t5700: document a failure of alternates to affect fetch mhagger
2012-02-13 3:35 ` Junio C Hamano
2012-02-13 4:45 ` Michael Haggerty
2012-02-11 6:20 ` [PATCH 2/7] clone.c: move more code into the "if (refs)" conditional mhagger
2012-02-13 3:35 ` Junio C Hamano
2012-02-11 6:20 ` [PATCH 3/7] fetch-pack.c: rename some parameters from "path" to "refname" mhagger
2012-02-13 3:47 ` Junio C Hamano
2012-02-11 6:20 ` mhagger [this message]
2012-02-11 6:20 ` [PATCH 5/7] everything_local(): mark alternate refs as complete mhagger
2012-02-11 6:21 ` [PATCH 6/7] clone: do not add alternate references to extra_refs mhagger
2012-02-13 4:00 ` Junio C Hamano
2012-02-11 6:21 ` [PATCH 7/7] refs: remove the extra_refs API mhagger
2012-02-14 22:51 ` [PATCH 0/7] Make alternates affect fetch behavior Jeff King
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=1328941261-29746-5-git-send-email-mhagger@alum.mit.edu \
--to=mhagger@alum.mit.edu \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=hvoigt@hvoigt.net \
--cc=jnareb@gmail.com \
--cc=johan@herland.net \
--cc=peff@peff.net \
/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).