From: mhagger@alum.mit.edu
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Jeff King <peff@peff.net>,
Drew Northup <drew.northup@maine.edu>,
Jakub Narebski <jnareb@gmail.com>,
Heiko Voigt <hvoigt@hvoigt.net>,
Johan Herland <johan@herland.net>,
Julian Phillips <julian@quantumfyre.co.uk>,
Michael Haggerty <mhagger@alum.mit.edu>
Subject: [PATCH 12/14] get_ref_dir(): change signature
Date: Thu, 13 Oct 2011 09:58:33 +0200 [thread overview]
Message-ID: <1318492715-5931-13-git-send-email-mhagger@alum.mit.edu> (raw)
In-Reply-To: <1318492715-5931-1-git-send-email-mhagger@alum.mit.edu>
From: Michael Haggerty <mhagger@alum.mit.edu>
Change get_ref_dir() to take a (struct cached_refs *) in place of the
submodule name.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
---
refs.c | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/refs.c b/refs.c
index 1109c9f..01b8efd 100644
--- a/refs.c
+++ b/refs.c
@@ -300,14 +300,14 @@ static struct ref_array *get_packed_refs(struct cached_refs *refs)
return &refs->packed;
}
-static void get_ref_dir(const char *submodule, const char *base,
+static void get_ref_dir(struct cached_refs *refs, const char *base,
struct ref_array *array)
{
DIR *dir;
const char *path;
- if (*submodule)
- path = git_path_submodule(submodule, "%s", base);
+ if (*refs->name)
+ path = git_path_submodule(refs->name, "%s", base);
else
path = git_path("%s", base);
@@ -338,19 +338,19 @@ static void get_ref_dir(const char *submodule, const char *base,
if (has_extension(de->d_name, ".lock"))
continue;
memcpy(ref + baselen, de->d_name, namelen+1);
- refdir = submodule
- ? git_path_submodule(submodule, "%s", ref)
+ refdir = *refs->name
+ ? git_path_submodule(refs->name, "%s", ref)
: git_path("%s", ref);
if (stat(refdir, &st) < 0)
continue;
if (S_ISDIR(st.st_mode)) {
- get_ref_dir(submodule, ref, array);
+ get_ref_dir(refs, ref, array);
continue;
}
- if (submodule) {
+ if (*refs->name) {
hashclr(sha1);
flag = 0;
- if (resolve_gitlink_ref(submodule, ref, sha1) < 0) {
+ if (resolve_gitlink_ref(refs->name, ref, sha1) < 0) {
hashclr(sha1);
flag |= REF_BROKEN;
}
@@ -403,7 +403,7 @@ void warn_dangling_symref(FILE *fp, const char *msg_fmt, const char *refname)
static struct ref_array *get_loose_refs(struct cached_refs *refs)
{
if (!refs->did_loose) {
- get_ref_dir(refs->name, "refs", &refs->loose);
+ get_ref_dir(refs, "refs", &refs->loose);
sort_ref_array(&refs->loose);
refs->did_loose = 1;
}
--
1.7.7.rc2
next prev parent reply other threads:[~2011-10-13 7:59 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-13 7:58 [PATCH 00/14] Tidying up references code mhagger
2011-10-13 7:58 ` [PATCH 01/14] cache.h: add comments for git_path() and git_path_submodule() mhagger
2011-10-13 18:37 ` Junio C Hamano
2011-10-13 7:58 ` [PATCH 02/14] struct ref_list: document name member mhagger
2011-10-13 18:37 ` Junio C Hamano
2011-10-13 7:58 ` [PATCH 03/14] refs.c: rename some local "refname" variables mhagger
2011-10-13 7:58 ` [PATCH 04/14] refs: rename some parameters result -> sha1 mhagger
2011-10-13 18:42 ` Junio C Hamano
2011-10-13 7:58 ` [PATCH 05/14] clear_ref_list(): rename from free_ref_list() mhagger
2011-10-13 18:43 ` Junio C Hamano
2011-10-13 7:58 ` [PATCH 06/14] resolve_gitlink_ref(): improve docstring mhagger
2011-10-13 18:48 ` Junio C Hamano
2011-10-13 7:58 ` [PATCH 07/14] is_refname_available(): remove the "quiet" argument mhagger
2011-10-13 12:41 ` Drew Northup
2011-10-13 18:49 ` Junio C Hamano
2011-10-14 5:35 ` Michael Haggerty
2011-10-13 7:58 ` [PATCH 08/14] parse_ref_line(): add docstring mhagger
2011-10-13 7:58 ` [PATCH 09/14] add_ref(): " mhagger
2011-10-13 7:58 ` [PATCH 10/14] is_dup_ref(): extract function from sort_ref_list() mhagger
2011-10-13 20:43 ` Junio C Hamano
2011-10-13 7:58 ` [PATCH 11/14] refs: change signatures of get_packed_refs() and get_loose_refs() mhagger
2011-10-13 7:58 ` mhagger [this message]
2011-10-13 7:58 ` [PATCH 13/14] Pass a (cached_refs *) to the resolve_gitlink_*() functions mhagger
2011-10-13 7:58 ` [PATCH 14/14] resolve_gitlink_ref_recursive(): change to work with struct cached_refs mhagger
2011-10-13 8:06 ` [PATCH] t1402-check-ref-format: skip tests of refs beginning with slash on Windows Johannes Sixt
2011-10-13 23:00 ` Junio C Hamano
2011-10-13 23:07 ` Junio C Hamano
2011-10-14 6:40 ` Johannes Sixt
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=1318492715-5931-13-git-send-email-mhagger@alum.mit.edu \
--to=mhagger@alum.mit.edu \
--cc=drew.northup@maine.edu \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=hvoigt@hvoigt.net \
--cc=jnareb@gmail.com \
--cc=johan@herland.net \
--cc=julian@quantumfyre.co.uk \
--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).