From: Lars Hjemli <hjemli@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>
Subject: [RFC/PATCH 1/3] tree.c: add support for traversal of submodules
Date: Mon, 12 Jan 2009 00:45:53 +0100 [thread overview]
Message-ID: <1231717555-10559-2-git-send-email-hjemli@gmail.com> (raw)
In-Reply-To: <1231717555-10559-1-git-send-email-hjemli@gmail.com>
If the commit referenced by a gitlink is available in the (possibly
alternate) object database, read_tree_recursive() is now able to descend
into the tree of the linked commit if the flag 'traverse_gitlinks' is
turned on.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
---
tree.c | 20 +++++++++++++++++---
tree.h | 1 +
2 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/tree.c b/tree.c
index 03e782a..1468e10 100644
--- a/tree.c
+++ b/tree.c
@@ -7,6 +7,7 @@
#include "tree-walk.h"
const char *tree_type = "tree";
+int traverse_gitlinks = 0;
static int read_one_entry_opt(const unsigned char *sha1, const char *base, int baselen, const char *pathname, unsigned mode, int stage, int opt)
{
@@ -114,16 +115,29 @@ int read_tree_recursive(struct tree *tree,
default:
return -1;
}
- if (S_ISDIR(entry.mode)) {
+ if (S_ISDIR(entry.mode) || (traverse_gitlinks && S_ISGITLINK(entry.mode))) {
int retval;
char *newbase;
unsigned int pathlen = tree_entry_len(entry.path, entry.sha1);
-
+ struct commit *commit;
+ struct tree *node;
+
+ if (S_ISDIR(entry.mode)) {
+ node = lookup_tree(entry.sha1);
+ } else {
+ commit = lookup_commit_reference_gently(entry.sha1, 1);
+ if (!commit)
+ continue;
+ if (parse_commit(commit))
+ die("parse_commit(%s) failed",
+ sha1_to_hex(entry.sha1));
+ node = commit->tree;
+ }
newbase = xmalloc(baselen + 1 + pathlen);
memcpy(newbase, base, baselen);
memcpy(newbase + baselen, entry.path, pathlen);
newbase[baselen + pathlen] = '/';
- retval = read_tree_recursive(lookup_tree(entry.sha1),
+ retval = read_tree_recursive(node,
newbase,
baselen + pathlen + 1,
stage, match, fn, context);
diff --git a/tree.h b/tree.h
index 2ff01a4..b6b938f 100644
--- a/tree.h
+++ b/tree.h
@@ -4,6 +4,7 @@
#include "object.h"
extern const char *tree_type;
+extern int traverse_gitlinks;
struct tree {
struct object object;
--
1.6.1.81.g1df1.dirty
next prev parent reply other threads:[~2009-01-12 1:57 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-11 23:45 [RFC/PATCH 0/3] Enable in-process submodule traversal Lars Hjemli
2009-01-11 23:45 ` Lars Hjemli [this message]
2009-01-11 23:45 ` [RFC/PATCH 2/3] archive.c: enable traversal of submodules Lars Hjemli
2009-01-11 23:45 ` [RFC/PATCH 3/3] builtin-ls-tree: " Lars Hjemli
2009-01-12 3:15 ` [RFC/PATCH 1/3] tree.c: add support for " Junio C Hamano
2009-01-12 9:04 ` Lars Hjemli
2009-01-12 10:07 ` Junio C Hamano
2009-01-12 10:59 ` Lars Hjemli
2009-01-12 2:07 ` [RFC/PATCH 0/3] Enable in-process submodule traversal 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1231717555-10559-2-git-send-email-hjemli@gmail.com \
--to=hjemli@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).