summaryrefslogtreecommitdiff
path: root/builtin-ls-tree.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2007-04-10 04:20:29 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-04-10 20:50:43 (GMT)
commitf35a6d3bce79c2995bbf0a3bd9fcad29e54a8d3c (patch)
treefca31eb00aea9a6a82ff493090c2da81af761ccc /builtin-ls-tree.c
parent8d9721c86b0169c282ad1c5528317eafeb7fb0f7 (diff)
downloadgit-f35a6d3bce79c2995bbf0a3bd9fcad29e54a8d3c.zip
git-f35a6d3bce79c2995bbf0a3bd9fcad29e54a8d3c.tar.gz
git-f35a6d3bce79c2995bbf0a3bd9fcad29e54a8d3c.tar.bz2
Teach core object handling functions about gitlinks
This teaches the really fundamental core SHA1 object handling routines about gitlinks. We can compare trees with gitlinks in them (although we can not actually generate patches for them yet - just raw git diffs), and they show up as commits in "git ls-tree". We also know to compare gitlinks as if they were directories (ie the normal "sort as trees" rules apply). [jc: amended a cut&paste error] Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'builtin-ls-tree.c')
-rw-r--r--builtin-ls-tree.c20
1 files changed, 19 insertions, 1 deletions
diff --git a/builtin-ls-tree.c b/builtin-ls-tree.c
index 6472610..1cb4dca 100644
--- a/builtin-ls-tree.c
+++ b/builtin-ls-tree.c
@@ -6,6 +6,7 @@
#include "cache.h"
#include "blob.h"
#include "tree.h"
+#include "commit.h"
#include "quote.h"
#include "builtin.h"
@@ -59,7 +60,24 @@ static int show_tree(const unsigned char *sha1, const char *base, int baselen,
int retval = 0;
const char *type = blob_type;
- if (S_ISDIR(mode)) {
+ if (S_ISDIRLNK(mode)) {
+ /*
+ * Maybe we want to have some recursive version here?
+ *
+ * Something like:
+ *
+ if (show_subprojects(base, baselen, pathname)) {
+ if (fork()) {
+ chdir(base);
+ exec ls-tree;
+ }
+ waitpid();
+ }
+ *
+ * ..or similar..
+ */
+ type = commit_type;
+ } else if (S_ISDIR(mode)) {
if (show_recursive(base, baselen, pathname)) {
retval = READ_TREE_RECURSIVE;
if (!(ls_options & LS_SHOW_TREES))