[PATCH v3 1/3] tree-walk: learn get_tree_entry_follow_symlinks

[PATCH v3 1/3] tree-walk: learn get_tree_entry_follow_symlinks

[dturner]

From: David Turner <dturner@twitter.com>

Add a new function, get_tree_entry_follow_symlinks, to tree-walk.[ch].
The function is not yet used.  It will be used to implement git
cat-file --batch --follow-symlinks.

The function locates an object by path, following symlinks in the
repository.  If the symlinks lead outside the repository, the function
reports this to the caller.

Signed-off-by: David Turner <dturner@twitter.com>
---
 cache.h     |   5 ++
 tree-walk.c | 195 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 tree-walk.h |   2 +
 3 files changed, 202 insertions(+)

diff --git a/cache.h b/cache.h
index 3d3244b..679faa9 100644
--- a/cache.h
+++ b/cache.h
@@ -922,6 +922,11 @@ struct object_context {
 	unsigned char tree[20];
 	char path[PATH_MAX];
 	unsigned mode;
+	/*
+	 * symlink_path is only used by get_tree_entry_follow_symlinks,
+	 * and only for symlinks that point outside the repository.
+	 */
+	struct strbuf symlink_path;
 };
 
 #define GET_SHA1_QUIETLY        01
diff --git a/tree-walk.c b/tree-walk.c
index 5dd9a71..f93492d 100644
--- a/tree-walk.c
+++ b/tree-walk.c
@@ -415,6 +415,12 @@ int traverse_trees(int n, struct tree_desc *t, struct traverse_info *info)
 	return error;
 }
 
+struct dir_state {
+	void *tree;
+	unsigned long size;
+	unsigned char sha1[20];
+};
+
 static int find_tree_entry(struct tree_desc *t, const char *name, unsigned char *result, unsigned *mode)
 {
 	int namelen = strlen(name);
@@ -478,6 +484,195 @@ int get_tree_entry(const unsigned char *tree_sha1, const char *name, unsigned ch
 	return retval;
 }
 
+/* This is Linux's built-in max for the number of symlinks to follow.
+ * That limit, of course, does not affect git, but it's a reasonable
+ * choice.
+ */
+#define GET_TREE_ENTRY_FOLLOW_SYMLINKS_MAX_LINKS 40
+
+/**
+ * Find a tree entry by following symlinks in tree_sha (which is
+ * assumed to be the root of the repository).  In the event that a
+ * symlink points outside the repository (e.g. a link to /foo or a
+ * root-level link to ../foo), the portion of the link which is
+ * outside the repository will be returned in result_path, and *mode
+ * will be set to 0.  It is assumed that result_path is uninitialized.
+ * If there are no symlinks, or the end result of the symlink chain
+ * points to an object inside the repository, result will be filled in
+ * with the sha1 of the found object, and *mode will hold the mode of
+ * the object.  If there is a symlink loop, -1 will be returned.
+ */
+int get_tree_entry_follow_symlinks(unsigned char *tree_sha1, const char *name, unsigned char *result, struct strbuf *result_path, unsigned *mode)
+{
+	int retval = -1;
+	void *tree;
+	struct dir_state *parents = NULL;
+	size_t parents_alloc = 0;
+	ssize_t parents_nr = 0;
+	unsigned long size;
+	unsigned char root[20];
+	unsigned char current_tree_sha1[20];
+	struct strbuf namebuf = STRBUF_INIT;
+	enum object_type type;
+	int already_have_tree = 0;
+	struct tree_desc t = {0};
+	int follows_remaining = GET_TREE_ENTRY_FOLLOW_SYMLINKS_MAX_LINKS;
+	int i;
+
+	result_path->buf = 0;
+	result_path->alloc = 0;
+	result_path->len = 0;
+	strbuf_addstr(&namebuf, name);
+	hashcpy(current_tree_sha1, tree_sha1);
+
+	while (1) {
+		char *first_slash;
+		char *remainder = NULL;
+		int find_result;
+
+		if (!t.buffer) {
+			tree = read_object_with_reference(current_tree_sha1,
+							  tree_type, &size,
+							  root);
+			if (!tree)
+				goto done;
+
+			ALLOC_GROW(parents, parents_nr + 1, parents_alloc);
+			parents[parents_nr].tree = tree;
+			parents[parents_nr].size = size;
+			hashcpy(parents[parents_nr].sha1, root);
+
+			parents_nr++;
+
+			if (namebuf.buf[0] == '\0') {
+				hashcpy(result, root);
+				retval = 0;
+				goto done;
+			}
+
+			if (!size)
+				goto done;
+
+			/* descend */
+			init_tree_desc(&t, tree, size);
+		}
+
+		/* Handle symlinks to e.g. a//b by removing leading slashes */
+		while (namebuf.buf[0] == '/') {
+			strbuf_remove(&namebuf, 0, 1);
+		}
+
+		/* Split namebuf into a first component and a
+		 * remainder */
+		if ((first_slash = strchr(namebuf.buf, '/'))) {
+			*first_slash = 0;
+			remainder = first_slash + 1;
+		}
+
+		if (!strcmp(namebuf.buf, "..")) {
+			struct dir_state *parent;
+			/* We could end up with .. in the namebuf if
+			 * it appears in a symlink. */
+
+			if (parents_nr == 1) {
+				if (remainder)
+					*first_slash = '/';
+				strbuf_add(result_path, namebuf.buf,
+					   namebuf.len);
+				*mode = 0;
+				retval = 0;
+				goto done;
+			}
+			parent = &parents[parents_nr - 1];
+			free(parent->tree);
+			parents_nr--;
+			parent = &parents[parents_nr - 1];
+			init_tree_desc(&t, parent->tree, parent->size);
+			strbuf_remove(&namebuf, 0, remainder ? 3 : 2);
+			continue;
+		}
+
+		/* We could end up here via a symlink to dir/.. */
+		if (namebuf.buf[0] == '\0') {
+			hashcpy(result, parents[parents_nr - 1].sha1);
+			retval = 0;
+			goto done;
+		}
+
+		/* Look up the first (or only) path component
+		 * in the tree. */
+		find_result = find_tree_entry(&t, namebuf.buf,
+					      current_tree_sha1, mode);
+		if (find_result) {
+			retval = find_result;
+			goto done;
+		}
+
+		if (S_ISDIR(*mode)) {
+			if (!remainder) {
+				hashcpy(result, current_tree_sha1);
+				retval = 0;
+				goto done;
+			}
+			/* Descend the tree */
+			t.buffer = NULL;
+			strbuf_remove(&namebuf, 0,
+				      1 + first_slash - namebuf.buf);
+		} else if (S_ISREG(*mode)) {
+			if (!remainder) {
+				hashcpy(result, current_tree_sha1);
+				retval = 0;
+			}
+			goto done;
+		} else if (S_ISLNK(*mode)) {
+			/* Follow a symlink */
+			size_t link_len, len;
+			char *contents, *contents_start;
+			struct dir_state *parent;
+
+			if (follows_remaining-- == 0)
+				/* Too many symlinks followed */
+				goto done;
+
+			contents = read_sha1_file(current_tree_sha1, &type,
+						  &link_len);
+
+			if (!contents)
+				goto done;
+
+			if (contents[0] == '/') {
+				strbuf_addstr(result_path, contents);
+				*mode = 0;
+				retval = 0;
+				goto done;
+			}
+
+			if (remainder)
+				len = first_slash - namebuf.buf;
+			else
+				len = namebuf.len;
+
+			contents_start = contents;
+
+			parent = &parents[parents_nr - 1];
+			init_tree_desc(&t, parent->tree, parent->size);
+			strbuf_splice(&namebuf, 0, len,
+				      contents_start, link_len);
+			if (remainder)
+				namebuf.buf[link_len] = '/';
+			free(contents);
+		}
+	}
+done:
+	for (i = 0; i < parents_nr; ++i) {
+		free(parents[i].tree);
+	}
+	free(parents);
+
+	strbuf_release(&namebuf);
+	return retval;
+}
+
 static int match_entry(const struct pathspec_item *item,
 		       const struct name_entry *entry, int pathlen,
 		       const char *match, int matchlen,
diff --git a/tree-walk.h b/tree-walk.h
index ae7fb3a..d1670c6 100644
--- a/tree-walk.h
+++ b/tree-walk.h
@@ -40,6 +40,8 @@ struct traverse_info;
 typedef int (*traverse_callback_t)(int n, unsigned long mask, unsigned long dirmask, struct name_entry *entry, struct traverse_info *);
 int traverse_trees(int n, struct tree_desc *t, struct traverse_info *info);
 
+int get_tree_entry_follow_symlinks(unsigned char *tree_sha1, const char *name, unsigned char *result, struct strbuf *result_path, unsigned *mode);
+
 struct traverse_info {
 	struct traverse_info *prev;
 	struct name_entry name;
-- 
2.0.4.315.gad8727a-twtrsrc

[PATCH v3 2/3] sha1_name: get_sha1_with_context learns to follow symlinks

[dturner]

From: David Turner <dturner@twitter.com>

Wire up get_sha1_with_context to call get_tree_entry_follow_symlinks
when GET_SHA1_FOLLOW_SYMLINKS is passed in flags. G_S_FOLLOW_SYMLINKS
is incompatible with G_S_ONLY_TO_DIE because the diagnosis
that ONLY_TO_DIE triggers does not at present consider symlinks, and
it would be a significant amount of additional code to allow it to
do so.

Signed-off-by: David Turner <dturner@twitter.com>
---
 cache.h     | 15 ++++++++-------
 sha1_name.c | 23 ++++++++++++++++-------
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/cache.h b/cache.h
index 679faa9..65505d1 100644
--- a/cache.h
+++ b/cache.h
@@ -929,13 +929,14 @@ struct object_context {
 	struct strbuf symlink_path;
 };
 
-#define GET_SHA1_QUIETLY        01
-#define GET_SHA1_COMMIT         02
-#define GET_SHA1_COMMITTISH     04
-#define GET_SHA1_TREE          010
-#define GET_SHA1_TREEISH       020
-#define GET_SHA1_BLOB	       040
-#define GET_SHA1_ONLY_TO_DIE 04000
+#define GET_SHA1_QUIETLY           01
+#define GET_SHA1_COMMIT            02
+#define GET_SHA1_COMMITTISH        04
+#define GET_SHA1_TREE             010
+#define GET_SHA1_TREEISH          020
+#define GET_SHA1_BLOB             040
+#define GET_SHA1_FOLLOW_SYMLINKS 0100
+#define GET_SHA1_ONLY_TO_DIE    04000
 
 extern int get_sha1(const char *str, unsigned char *sha1);
 extern int get_sha1_commit(const char *str, unsigned char *sha1);
diff --git a/sha1_name.c b/sha1_name.c
index 6d10f05..325f666 100644
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -1434,15 +1434,22 @@ static int get_sha1_with_context_1(const char *name,
 			new_filename = resolve_relative_path(filename);
 			if (new_filename)
 				filename = new_filename;
-			ret = get_tree_entry(tree_sha1, filename, sha1, &oc->mode);
-			if (ret && only_to_die) {
-				diagnose_invalid_sha1_path(prefix, filename,
-							   tree_sha1,
-							   name, len);
+			if (flags & GET_SHA1_FOLLOW_SYMLINKS) {
+				ret = get_tree_entry_follow_symlinks(tree_sha1,
+					filename, sha1, &oc->symlink_path,
+					&oc->mode);
+			} else {
+				ret = get_tree_entry(tree_sha1, filename,
+						     sha1, &oc->mode);
+				if (ret && only_to_die) {
+					diagnose_invalid_sha1_path(prefix,
+								   filename,
+								   tree_sha1,
+								   name, len);
+				}
 			}
-			hashcpy(oc->tree, tree_sha1);
 			strlcpy(oc->path, filename, sizeof(oc->path));
-
+			hashcpy(oc->tree, tree_sha1);
 			free(new_filename);
 			return ret;
 		} else {
@@ -1469,5 +1476,7 @@ void maybe_die_on_misspelt_object_name(const char *name, const char *prefix)
 
 int get_sha1_with_context(const char *str, unsigned flags, unsigned char *sha1, struct object_context *orc)
 {
+	if (flags & GET_SHA1_FOLLOW_SYMLINKS && flags & GET_SHA1_ONLY_TO_DIE)
+		die("BUG: incompatible flags for get_sha1_with_context");
 	return get_sha1_with_context_1(str, flags, NULL, sha1, orc);
 }
-- 
2.0.4.315.gad8727a-twtrsrc

[PATCH v3 3/3] cat-file: add --follow-symlinks to --batch

[dturner]

From: David Turner <dturner@twitter.com>

This wires the in-repo-symlink following code through to the cat-file
builtin.  In the event of an out-of-repo link, cat-file will print
the link in a new format.

Signed-off-by: David Turner <dturner@twitter.com>
---
 Documentation/git-cat-file.txt |  28 +++++-
 builtin/cat-file.c             |  24 +++++-
 t/t1006-cat-file.sh            | 190 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 237 insertions(+), 5 deletions(-)

diff --git a/Documentation/git-cat-file.txt b/Documentation/git-cat-file.txt
index f6a16f4..18b67a3 100644
--- a/Documentation/git-cat-file.txt
+++ b/Documentation/git-cat-file.txt
@@ -10,7 +10,7 @@ SYNOPSIS
 --------
 [verse]
 'git cat-file' (-t | -s | -e | -p | <type> | --textconv ) <object>
-'git cat-file' (--batch | --batch-check) < <list-of-objects>
+'git cat-file' (--batch | --batch-check) [--follow-symlinks] < <list-of-objects>
 
 DESCRIPTION
 -----------
@@ -69,6 +69,19 @@ OPTIONS
 	not be combined with any other options or arguments.  See the
 	section `BATCH OUTPUT` below for details.
 
+--follow-symlinks::
+	Follow symlinks inside the repository.  Instead of providing
+	output about the link itself, provide output about the linked-to
+	object.  This option requires --batch or --batch-check.  In the
+	event of a symlink loop (or more than 40 symlinks in a symlink
+	resolution chain), the file will be treated as missing.  If a
+	symlink points outside the repository (e.g. a link to /foo or a
+	root-level link to ../foo), the portion of the link which is
+	outside the repository will be printed.  Follow-symlinks will
+	be silently turned off if <object> specifies an object in the
+	index rather than one in the object database.
+
+
 OUTPUT
 ------
 If '-t' is specified, one of the <type>.
@@ -148,6 +161,19 @@ the repository, then `cat-file` will ignore any custom format and print:
 <object> SP missing LF
 ------------
 
+If --follow-symlinks is used, and a symlink in the repository points
+outside the repository, then `cat-file` will ignore any custom format
+and print:
+
+------------
+symlink SP <size> LF <symlink> LF
+------------
+
+The symlink will either be absolute (beginning with a /), or relative
+to the repository root.  For instance, if dir/link points to ../../foo,
+then <symlink> will be ../foo.  <size> is the size of the symlink in
+bytes.
+
 
 CAVEATS
 -------
diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index df99df4..6bcf9a0 100644
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -224,6 +224,7 @@ static void print_object_or_die(int fd, struct expand_data *data)
 
 struct batch_options {
 	int enabled;
+	int follow_symlinks;
 	int print_contents;
 	const char *format;
 };
@@ -232,16 +233,25 @@ static int batch_one_object(const char *obj_name, struct batch_options *opt,
 			    struct expand_data *data)
 {
 	struct strbuf buf = STRBUF_INIT;
+	struct object_context ctx;
+	int flags = opt->follow_symlinks ? GET_SHA1_FOLLOW_SYMLINKS : 0;
 
 	if (!obj_name)
 	   return 1;
 
-	if (get_sha1(obj_name, data->sha1)) {
+	if (get_sha1_with_context(obj_name, flags, data->sha1, &ctx)) {
 		printf("%s missing\n", obj_name);
 		fflush(stdout);
 		return 0;
 	}
 
+	if (ctx.mode == 0) {
+		printf("symlink %"PRIuMAX"\n%s\n",
+		       (uintmax_t)ctx.symlink_path.len,
+		       ctx.symlink_path.buf);
+		return 0;
+	}
+
 	if (sha1_object_info_extended(data->sha1, &data->info, LOOKUP_REPLACE_OBJECT) < 0) {
 		printf("%s missing\n", obj_name);
 		fflush(stdout);
@@ -342,9 +352,8 @@ static int batch_option_callback(const struct option *opt,
 {
 	struct batch_options *bo = opt->value;
 
-	if (unset) {
-		memset(bo, 0, sizeof(*bo));
-		return 0;
+	if (bo->enabled) {
+		return 1;
 	}
 
 	bo->enabled = 1;
@@ -369,6 +378,9 @@ int cmd_cat_file(int argc, const char **argv, const char *prefix)
 		OPT_SET_INT('p', NULL, &opt, N_("pretty-print object's content"), 'p'),
 		OPT_SET_INT(0, "textconv", &opt,
 			    N_("for blob objects, run textconv on object's content"), 'c'),
+		OPT_SET_INT(0, "follow-symlinks", &batch.follow_symlinks,
+			N_("follow in-repo symlinks; report out-of-repo symlinks (requires --batch or --batch-check)"),
+			    1),
 		{ OPTION_CALLBACK, 0, "batch", &batch, "format",
 			N_("show info and content of objects fed from the standard input"),
 			PARSE_OPT_OPTARG, batch_option_callback },
@@ -402,6 +414,10 @@ int cmd_cat_file(int argc, const char **argv, const char *prefix)
 		usage_with_options(cat_file_usage, options);
 	}
 
+	if (batch.follow_symlinks && !batch.enabled) {
+		usage_with_options(cat_file_usage, options);
+	}
+
 	if (batch.enabled)
 		return batch_objects(&batch);
 
diff --git a/t/t1006-cat-file.sh b/t/t1006-cat-file.sh
index ab36b1e..dd80c08 100755
--- a/t/t1006-cat-file.sh
+++ b/t/t1006-cat-file.sh
@@ -189,6 +189,13 @@ do
     '
 done
 
+for opt in t s e p
+do
+    test_expect_success "Passing -$opt with --follow-symlinks fails" '
+	    test_must_fail git cat-file --follow-symlinks -$opt $hello_sha1
+	'
+done
+
 test_expect_success "--batch-check for a non-existent named object" '
     test "foobar42 missing
 foobar84 missing" = \
@@ -296,4 +303,187 @@ test_expect_success '%(deltabase) reports packed delta bases' '
 	}
 '
 
+# Tests for git cat-file --follow-symlinks
+test_expect_success 'prep for symlink tests' '
+	echo_without_newline "$hello_content" > morx &&
+	ln -s morx same-dir-link &&
+	ln -s ../fleem out-of-repo-link &&
+	ln -s .. out-of-repo-link-dir &&
+	ln -s same-dir-link link-to-link &&
+	ln -s nope broken-same-dir-link &&
+	mkdir dir &&
+	ln -s ../morx dir/parent-dir-link &&
+	ln -s .. dir/link-dir &&
+	ln -s ../../escape dir/out-of-repo-link &&
+	ln -s ../.. dir/out-of-repo-link-dir &&
+	ln -s nope dir/broken-link-in-dir &&
+	mkdir dir/subdir &&
+	ln -s ../../morx dir/subdir/grandparent-dir-link &&
+	ln -s ../../../great-escape dir/subdir/out-of-repo-link &&
+	ln -s ../../.. dir/subdir/out-of-repo-link-dir &&
+	ln -s ../../../ dir/subdir/out-of-repo-link-dir-trailing &&
+	ln -s ../parent-dir-link dir/subdir/parent-dir-link-to-link &&
+	echo_without_newline "$hello_content" >dir/subdir/ind2 &&
+	echo_without_newline "$hello_content" >dir/ind1 &&
+	ln -s dir dirlink &&
+	ln -s dir/subdir subdirlink &&
+	ln -s subdir/ind2 dir/link-to-child &&
+	ln -s dir/link-to-child link-to-down-link &&
+	ln -s dir/.. up-down &&
+	ln -s dir/../ up-down-trailing &&
+	ln -s dir/../morx up-down-file &&
+	ln -s dir/../../morx up-up-down-file &&
+	ln -s subdirlink/../../morx up-two-down-file &&
+	ln -s loop1 loop2 &&
+	ln -s loop2 loop1 &&
+	git add . &&
+	git commit -am "test"
+'
+
+echo $hello_sha1 blob $hello_size > found
+
+test_expect_success 'git cat-file --batch-check --follow-symlinks works for non-links' '
+	echo HEAD:morx | git cat-file --batch-check --follow-symlinks > actual &&
+	test_cmp found actual &&
+	echo HEAD:nope missing > expect &&
+	echo HEAD:nope | git cat-file --batch-check --follow-symlinks > actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'git cat-file --batch-check --follow-symlinks works for in-repo, same-dir links' '
+	echo HEAD:same-dir-link | git cat-file --batch-check --follow-symlinks > actual &&
+	test_cmp found actual
+'
+
+test_expect_success 'git cat-file --batch-check --follow-symlinks works for broken in-repo, same-dir links' '
+	echo HEAD:broken-same-dir-link missing > expect &&
+	echo HEAD:broken-same-dir-link | git cat-file --batch-check --follow-symlinks > actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'git cat-file --batch-check --follow-symlinks works for same-dir links-to-links' '
+	echo HEAD:link-to-link | git cat-file --batch-check --follow-symlinks > actual &&
+	test_cmp found actual
+'
+
+test_expect_success 'git cat-file --batch-check --follow-symlinks works for parent-dir links' '
+	echo HEAD:dir/parent-dir-link | git cat-file --batch-check --follow-symlinks > actual &&
+	test_cmp found actual &&
+	echo HEAD:dir/parent-dir-link/nope missing > expect &&
+	echo HEAD:dir/parent-dir-link/nope | git cat-file --batch-check --follow-symlinks > actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'git cat-file --batch-check --follow-symlinks works for .. links' '
+	echo HEAD:dir/link-dir/nope missing > expect &&
+	echo HEAD:dir/link-dir/nope | git cat-file --batch-check --follow-symlinks > actual &&
+	test_cmp expect actual &&
+	echo HEAD:dir/link-dir/morx | git cat-file --batch-check --follow-symlinks > actual &&
+	test_cmp found actual &&
+	echo HEAD:dir/broken-link-in-dir missing > expect &&
+	echo HEAD:dir/broken-link-in-dir | git cat-file --batch-check --follow-symlinks > actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'git cat-file --batch-check --follow-symlinks works for ../.. links' '
+	echo HEAD:dir/subdir/grandparent-dir-link/nope missing > expect &&
+	echo HEAD:dir/subdir/grandparent-dir-link/nope | git cat-file --batch-check --follow-symlinks > actual &&
+	test_cmp expect actual &&
+	echo HEAD:dir/subdir/grandparent-dir-link | git cat-file --batch-check --follow-symlinks > actual &&
+	test_cmp found actual &&
+	echo HEAD:dir/subdir/parent-dir-link-to-link | git cat-file --batch-check --follow-symlinks > actual &&
+	test_cmp found actual
+'
+
+test_expect_success 'git cat-file --batch-check --follow-symlinks works for dir/ links' '
+	echo HEAD:dirlink/morx missing > expect &&
+	echo HEAD:dirlink/morx | git cat-file --batch-check --follow-symlinks > actual &&
+	test_cmp expect actual &&
+	echo $hello_sha1 blob $hello_size > expect &&
+	echo HEAD:dirlink/ind1 | git cat-file --batch-check --follow-symlinks > actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'git cat-file --batch-check --follow-symlinks works for dir/subdir links' '
+	echo HEAD:subdirlink/morx missing > expect &&
+	echo HEAD:subdirlink/morx | git cat-file --batch-check --follow-symlinks > actual &&
+	test_cmp expect actual &&
+	echo HEAD:subdirlink/ind2 | git cat-file --batch-check --follow-symlinks > actual &&
+	test_cmp found actual
+'
+
+test_expect_success 'git cat-file --batch-check --follow-symlinks works for dir -> subdir links' '
+	echo HEAD:dir/link-to-child/morx missing > expect &&
+	echo HEAD:dir/link-to-child/morx | git cat-file --batch-check --follow-symlinks > actual &&
+	test_cmp expect actual &&
+	echo HEAD:dir/link-to-child | git cat-file --batch-check --follow-symlinks > actual &&
+	test_cmp found actual &&
+	echo HEAD:link-to-down-link | git cat-file --batch-check --follow-symlinks > actual &&
+	test_cmp found actual
+'
+
+test_expect_success 'git cat-file --batch-check --follow-symlinks works for out-of-repo symlinks' '
+	echo symlink 8 > expect &&
+	echo ../fleem >> expect &&
+	echo HEAD:out-of-repo-link | git cat-file --batch-check --follow-symlinks > actual &&
+	test_cmp expect actual &&
+	echo symlink 2 > expect &&
+	echo .. >> expect &&
+	echo HEAD:out-of-repo-link-dir | git cat-file --batch-check --follow-symlinks > actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'git cat-file --batch-check --follow-symlinks works for out-of-repo symlinks in dirs' '
+	echo symlink 9 > expect &&
+	echo ../escape >> expect &&
+	echo HEAD:dir/out-of-repo-link | git cat-file --batch-check --follow-symlinks > actual &&
+	test_cmp expect actual &&
+	echo symlink 2 > expect &&
+	echo .. >> expect &&
+	echo HEAD:dir/out-of-repo-link-dir | git cat-file --batch-check --follow-symlinks > actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'git cat-file --batch-check --follow-symlinks works for out-of-repo symlinks in subdirs' '
+	echo symlink 15 > expect &&
+	echo ../great-escape >> expect &&
+	echo HEAD:dir/subdir/out-of-repo-link | git cat-file --batch-check --follow-symlinks > actual &&
+	test_cmp expect actual &&
+	echo symlink 2 > expect &&
+	echo .. >> expect &&
+	echo HEAD:dir/subdir/out-of-repo-link-dir | git cat-file --batch-check --follow-symlinks > actual &&
+	test_cmp expect actual &&
+	echo symlink 3 > expect &&
+	echo ../ >> expect &&
+	echo HEAD:dir/subdir/out-of-repo-link-dir-trailing | git cat-file --batch-check --follow-symlinks > actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'git cat-file --batch-check --follow-symlinks works for symlinks with internal ..' '
+	echo HEAD: | git cat-file --batch-check > expect &&
+	echo HEAD:up-down | git cat-file --batch-check --follow-symlinks > actual &&
+	test_cmp expect actual &&
+	echo HEAD:up-down-trailing | git cat-file --batch-check --follow-symlinks > actual &&
+	test_cmp expect actual &&
+	echo HEAD:up-down-file | git cat-file --batch-check --follow-symlinks > actual &&
+	test_cmp found actual &&
+	echo symlink 7 > expect &&
+	echo ../morx >> expect &&
+	echo HEAD:up-up-down-file | git cat-file --batch-check --follow-symlinks > actual &&
+	test_cmp expect actual &&
+	echo HEAD:up-two-down-file | git cat-file --batch-check --follow-symlinks > actual &&
+	test_cmp found actual
+'
+
+test_expect_success 'git cat-file --batch-check --follow-symlink breaks loops' '
+	echo HEAD:loop1 missing > expect &&
+	echo HEAD:loop1 | git cat-file --batch-check --follow-symlinks > actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'git cat-file --batch --follow-symlink returns correct sha and mode' '
+	echo HEAD:morx | git cat-file --batch > expect &&
+	echo HEAD:morx | git cat-file --batch --follow-symlinks > actual &&
+	test_cmp expect actual
+'
 test_done
-- 
2.0.4.315.gad8727a-twtrsrc

Re: [PATCH v3 3/3] cat-file: add --follow-symlinks to --batch

[Johannes Sixt]

Am 09.05.2015 um 22:36 schrieb dturner@twopensource.com:
> diff --git a/t/t1006-cat-file.sh b/t/t1006-cat-file.sh
> index ab36b1e..dd80c08 100755
> --- a/t/t1006-cat-file.sh
> +++ b/t/t1006-cat-file.sh
> @@ -189,6 +189,13 @@ do
>       '
>   done
>
> +for opt in t s e p
> +do
> +    test_expect_success "Passing -$opt with --follow-symlinks fails" '
> +	    test_must_fail git cat-file --follow-symlinks -$opt $hello_sha1
> +	'
> +done
> +
>   test_expect_success "--batch-check for a non-existent named object" '
>       test "foobar42 missing
>   foobar84 missing" = \
> @@ -296,4 +303,187 @@ test_expect_success '%(deltabase) reports packed delta bases' '
>   	}
>   '
>
> +# Tests for git cat-file --follow-symlinks
> +test_expect_success 'prep for symlink tests' '
> +	echo_without_newline "$hello_content" > morx &&
> +	ln -s morx same-dir-link &&
> +	ln -s ../fleem out-of-repo-link &&
> +	ln -s .. out-of-repo-link-dir &&
> +	ln -s same-dir-link link-to-link &&
> +	ln -s nope broken-same-dir-link &&
> +	mkdir dir &&
> +	ln -s ../morx dir/parent-dir-link &&
> +	ln -s .. dir/link-dir &&
> +	ln -s ../../escape dir/out-of-repo-link &&
> +	ln -s ../.. dir/out-of-repo-link-dir &&
> +	ln -s nope dir/broken-link-in-dir &&
> +	mkdir dir/subdir &&
> +	ln -s ../../morx dir/subdir/grandparent-dir-link &&
> +	ln -s ../../../great-escape dir/subdir/out-of-repo-link &&
> +	ln -s ../../.. dir/subdir/out-of-repo-link-dir &&
> +	ln -s ../../../ dir/subdir/out-of-repo-link-dir-trailing &&
> +	ln -s ../parent-dir-link dir/subdir/parent-dir-link-to-link &&
> +	echo_without_newline "$hello_content" >dir/subdir/ind2 &&
> +	echo_without_newline "$hello_content" >dir/ind1 &&
> +	ln -s dir dirlink &&
> +	ln -s dir/subdir subdirlink &&
> +	ln -s subdir/ind2 dir/link-to-child &&
> +	ln -s dir/link-to-child link-to-down-link &&
> +	ln -s dir/.. up-down &&
> +	ln -s dir/../ up-down-trailing &&
> +	ln -s dir/../morx up-down-file &&
> +	ln -s dir/../../morx up-up-down-file &&
> +	ln -s subdirlink/../../morx up-two-down-file &&
> +	ln -s loop1 loop2 &&
> +	ln -s loop2 loop1 &&
> +	git add . &&
> +	git commit -am "test"
> +'

These tests will fail on a file system that does not support symbolic 
links, such as on Windows. Would you please separate the test cases 
(that come after the setup) into two groups:

1. Those that inspect the filesystem and expect a symbolic link. Protect 
these tests with a SYMLINKS prerequisite.

2. Those that look only at repository or index contents and do not 
require a symbolic link on the file system. These do not need to be 
protected.

Note that you do not require a symlink enabled file system to generate a 
repository with symlinks, i.e., you don't have to protect the setup code 
with SYMLINKS. For this, you can use 'test_ln_s_add' instead of the 
above sequence of 'ln -s' followed by a single 'git add .'.

> +
> +echo $hello_sha1 blob $hello_size > found

This seems to be used only in the next test. Please move it inside 
test_expect_success.

> +
> +test_expect_success 'git cat-file --batch-check --follow-symlinks works for non-links' '
> +	echo HEAD:morx | git cat-file --batch-check --follow-symlinks > actual &&
> +	test_cmp found actual &&
> +	echo HEAD:nope missing > expect &&
> +	echo HEAD:nope | git cat-file --batch-check --follow-symlinks > actual &&
> +	test_cmp expect actual
> +'
> +
> +test_expect_success 'git cat-file --batch-check --follow-symlinks works for in-repo, same-dir links' '
> +	echo HEAD:same-dir-link | git cat-file --batch-check --follow-symlinks > actual &&
> +	test_cmp found actual
> +'
> +
> +test_expect_success 'git cat-file --batch-check --follow-symlinks works for broken in-repo, same-dir links' '
> +	echo HEAD:broken-same-dir-link missing > expect &&
> +	echo HEAD:broken-same-dir-link | git cat-file --batch-check --follow-symlinks > actual &&
> +	test_cmp expect actual
> +'
> +
> +test_expect_success 'git cat-file --batch-check --follow-symlinks works for same-dir links-to-links' '
> +	echo HEAD:link-to-link | git cat-file --batch-check --follow-symlinks > actual &&
> +	test_cmp found actual
> +'
> +
> +test_expect_success 'git cat-file --batch-check --follow-symlinks works for parent-dir links' '
> +	echo HEAD:dir/parent-dir-link | git cat-file --batch-check --follow-symlinks > actual &&
> +	test_cmp found actual &&
> +	echo HEAD:dir/parent-dir-link/nope missing > expect &&
> +	echo HEAD:dir/parent-dir-link/nope | git cat-file --batch-check --follow-symlinks > actual &&
> +	test_cmp expect actual
> +'
> +
> +test_expect_success 'git cat-file --batch-check --follow-symlinks works for .. links' '
> +	echo HEAD:dir/link-dir/nope missing > expect &&
> +	echo HEAD:dir/link-dir/nope | git cat-file --batch-check --follow-symlinks > actual &&
> +	test_cmp expect actual &&
> +	echo HEAD:dir/link-dir/morx | git cat-file --batch-check --follow-symlinks > actual &&
> +	test_cmp found actual &&
> +	echo HEAD:dir/broken-link-in-dir missing > expect &&
> +	echo HEAD:dir/broken-link-in-dir | git cat-file --batch-check --follow-symlinks > actual &&
> +	test_cmp expect actual
> +'
> +
> +test_expect_success 'git cat-file --batch-check --follow-symlinks works for ../.. links' '
> +	echo HEAD:dir/subdir/grandparent-dir-link/nope missing > expect &&
> +	echo HEAD:dir/subdir/grandparent-dir-link/nope | git cat-file --batch-check --follow-symlinks > actual &&
> +	test_cmp expect actual &&
> +	echo HEAD:dir/subdir/grandparent-dir-link | git cat-file --batch-check --follow-symlinks > actual &&
> +	test_cmp found actual &&
> +	echo HEAD:dir/subdir/parent-dir-link-to-link | git cat-file --batch-check --follow-symlinks > actual &&
> +	test_cmp found actual
> +'
> +
> +test_expect_success 'git cat-file --batch-check --follow-symlinks works for dir/ links' '
> +	echo HEAD:dirlink/morx missing > expect &&
> +	echo HEAD:dirlink/morx | git cat-file --batch-check --follow-symlinks > actual &&
> +	test_cmp expect actual &&
> +	echo $hello_sha1 blob $hello_size > expect &&
> +	echo HEAD:dirlink/ind1 | git cat-file --batch-check --follow-symlinks > actual &&
> +	test_cmp expect actual
> +'
> +
> +test_expect_success 'git cat-file --batch-check --follow-symlinks works for dir/subdir links' '
> +	echo HEAD:subdirlink/morx missing > expect &&
> +	echo HEAD:subdirlink/morx | git cat-file --batch-check --follow-symlinks > actual &&
> +	test_cmp expect actual &&
> +	echo HEAD:subdirlink/ind2 | git cat-file --batch-check --follow-symlinks > actual &&
> +	test_cmp found actual
> +'
> +
> +test_expect_success 'git cat-file --batch-check --follow-symlinks works for dir -> subdir links' '
> +	echo HEAD:dir/link-to-child/morx missing > expect &&
> +	echo HEAD:dir/link-to-child/morx | git cat-file --batch-check --follow-symlinks > actual &&
> +	test_cmp expect actual &&
> +	echo HEAD:dir/link-to-child | git cat-file --batch-check --follow-symlinks > actual &&
> +	test_cmp found actual &&
> +	echo HEAD:link-to-down-link | git cat-file --batch-check --follow-symlinks > actual &&
> +	test_cmp found actual
> +'
> +
> +test_expect_success 'git cat-file --batch-check --follow-symlinks works for out-of-repo symlinks' '
> +	echo symlink 8 > expect &&
> +	echo ../fleem >> expect &&
> +	echo HEAD:out-of-repo-link | git cat-file --batch-check --follow-symlinks > actual &&
> +	test_cmp expect actual &&
> +	echo symlink 2 > expect &&
> +	echo .. >> expect &&
> +	echo HEAD:out-of-repo-link-dir | git cat-file --batch-check --follow-symlinks > actual &&
> +	test_cmp expect actual
> +'
> +
> +test_expect_success 'git cat-file --batch-check --follow-symlinks works for out-of-repo symlinks in dirs' '
> +	echo symlink 9 > expect &&
> +	echo ../escape >> expect &&
> +	echo HEAD:dir/out-of-repo-link | git cat-file --batch-check --follow-symlinks > actual &&
> +	test_cmp expect actual &&
> +	echo symlink 2 > expect &&
> +	echo .. >> expect &&
> +	echo HEAD:dir/out-of-repo-link-dir | git cat-file --batch-check --follow-symlinks > actual &&
> +	test_cmp expect actual
> +'
> +
> +test_expect_success 'git cat-file --batch-check --follow-symlinks works for out-of-repo symlinks in subdirs' '
> +	echo symlink 15 > expect &&
> +	echo ../great-escape >> expect &&
> +	echo HEAD:dir/subdir/out-of-repo-link | git cat-file --batch-check --follow-symlinks > actual &&
> +	test_cmp expect actual &&
> +	echo symlink 2 > expect &&
> +	echo .. >> expect &&
> +	echo HEAD:dir/subdir/out-of-repo-link-dir | git cat-file --batch-check --follow-symlinks > actual &&
> +	test_cmp expect actual &&
> +	echo symlink 3 > expect &&
> +	echo ../ >> expect &&
> +	echo HEAD:dir/subdir/out-of-repo-link-dir-trailing | git cat-file --batch-check --follow-symlinks > actual &&
> +	test_cmp expect actual
> +'
> +
> +test_expect_success 'git cat-file --batch-check --follow-symlinks works for symlinks with internal ..' '
> +	echo HEAD: | git cat-file --batch-check > expect &&
> +	echo HEAD:up-down | git cat-file --batch-check --follow-symlinks > actual &&
> +	test_cmp expect actual &&
> +	echo HEAD:up-down-trailing | git cat-file --batch-check --follow-symlinks > actual &&
> +	test_cmp expect actual &&
> +	echo HEAD:up-down-file | git cat-file --batch-check --follow-symlinks > actual &&
> +	test_cmp found actual &&
> +	echo symlink 7 > expect &&
> +	echo ../morx >> expect &&
> +	echo HEAD:up-up-down-file | git cat-file --batch-check --follow-symlinks > actual &&
> +	test_cmp expect actual &&
> +	echo HEAD:up-two-down-file | git cat-file --batch-check --follow-symlinks > actual &&
> +	test_cmp found actual
> +'
> +
> +test_expect_success 'git cat-file --batch-check --follow-symlink breaks loops' '
> +	echo HEAD:loop1 missing > expect &&
> +	echo HEAD:loop1 | git cat-file --batch-check --follow-symlinks > actual &&
> +	test_cmp expect actual
> +'
> +
> +test_expect_success 'git cat-file --batch --follow-symlink returns correct sha and mode' '
> +	echo HEAD:morx | git cat-file --batch > expect &&
> +	echo HEAD:morx | git cat-file --batch --follow-symlinks > actual &&
> +	test_cmp expect actual
> +'
>   test_done
>

-- Hannes

Re: [PATCH v3 1/3] tree-walk: learn get_tree_entry_follow_symlinks

[Junio C Hamano]

dturner@twopensource.com writes:

> From: David Turner <dturner@twitter.com>
>
> Add a new function, get_tree_entry_follow_symlinks, to tree-walk.[ch].
> The function is not yet used.  It will be used to implement git
> cat-file --batch --follow-symlinks.
>
> The function locates an object by path, following symlinks in the
> repository.  If the symlinks lead outside the repository, the function
> reports this to the caller.
>
> Signed-off-by: David Turner <dturner@twitter.com>
> ---

Thanks.

>  cache.h     |   5 ++
>  tree-walk.c | 195 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>  tree-walk.h |   2 +
>  3 files changed, 202 insertions(+)
>
> diff --git a/cache.h b/cache.h
> index 3d3244b..679faa9 100644
> --- a/cache.h
> +++ b/cache.h
> @@ -922,6 +922,11 @@ struct object_context {
>  	unsigned char tree[20];
>  	char path[PATH_MAX];
>  	unsigned mode;
> +	/*
> +	 * symlink_path is only used by get_tree_entry_follow_symlinks,
> +	 * and only for symlinks that point outside the repository.
> +	 */
> +	struct strbuf symlink_path;
>  };

The new low-level helper introduced here does not fill this field,
it seems, and it would make it clear to move the above hunk to
[2/3] where it becomes necessary.

I haven't checked carefully enough to say there isn't any missing
corner cases in the follow-symlinks codepath with confidence, but
the logic there seems very sound.  Other than the above suggestion
and removal of "int already_have_tree" variable that is not used, I
have only minor style nits (attached to be squashable) [*1*] on this
patch.

Thanks.

[Footnote]

 *1* Style nits:

  a. Multi-line comment format.

  b. ALLOC_GROW() followed by filling parents_nr slot is concluded
     by incrementing parents_nr itself; that single logical unit is
     easier to see without a blank line in the middle.

  c. In C, we prefer post-increment i++ over pre-increment when its
     value is discarded.

  d. We tend to omit {} around a single-statement block.


 tree-walk.c | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/tree-walk.c b/tree-walk.c
index f93492d..b7ee665 100644
--- a/tree-walk.c
+++ b/tree-walk.c
@@ -484,7 +484,8 @@ int get_tree_entry(const unsigned char *tree_sha1, const char *name, unsigned ch
 	return retval;
 }
 
-/* This is Linux's built-in max for the number of symlinks to follow.
+/*
+ * This is Linux's built-in max for the number of symlinks to follow.
  * That limit, of course, does not affect git, but it's a reasonable
  * choice.
  */
@@ -514,7 +515,6 @@ int get_tree_entry_follow_symlinks(unsigned char *tree_sha1, const char *name, u
 	unsigned char current_tree_sha1[20];
 	struct strbuf namebuf = STRBUF_INIT;
 	enum object_type type;
-	int already_have_tree = 0;
 	struct tree_desc t = {0};
 	int follows_remaining = GET_TREE_ENTRY_FOLLOW_SYMLINKS_MAX_LINKS;
 	int i;
@@ -541,7 +541,6 @@ int get_tree_entry_follow_symlinks(unsigned char *tree_sha1, const char *name, u
 			parents[parents_nr].tree = tree;
 			parents[parents_nr].size = size;
 			hashcpy(parents[parents_nr].sha1, root);
-
 			parents_nr++;
 
 			if (namebuf.buf[0] == '\0') {
@@ -562,8 +561,7 @@ int get_tree_entry_follow_symlinks(unsigned char *tree_sha1, const char *name, u
 			strbuf_remove(&namebuf, 0, 1);
 		}
 
-		/* Split namebuf into a first component and a
-		 * remainder */
+		/* Split namebuf into a first component and a remainder */
 		if ((first_slash = strchr(namebuf.buf, '/'))) {
 			*first_slash = 0;
 			remainder = first_slash + 1;
@@ -571,8 +569,10 @@ int get_tree_entry_follow_symlinks(unsigned char *tree_sha1, const char *name, u
 
 		if (!strcmp(namebuf.buf, "..")) {
 			struct dir_state *parent;
-			/* We could end up with .. in the namebuf if
-			 * it appears in a symlink. */
+			/*
+			 * We could end up with .. in the namebuf if it
+			 * appears in a symlink.
+			 */
 
 			if (parents_nr == 1) {
 				if (remainder)
@@ -599,8 +599,7 @@ int get_tree_entry_follow_symlinks(unsigned char *tree_sha1, const char *name, u
 			goto done;
 		}
 
-		/* Look up the first (or only) path component
-		 * in the tree. */
+		/* Look up the first (or only) path component in the tree. */
 		find_result = find_tree_entry(&t, namebuf.buf,
 					      current_tree_sha1, mode);
 		if (find_result) {
@@ -664,9 +663,8 @@ int get_tree_entry_follow_symlinks(unsigned char *tree_sha1, const char *name, u
 		}
 	}
 done:
-	for (i = 0; i < parents_nr; ++i) {
+	for (i = 0; i < parents_nr; i++)
 		free(parents[i].tree);
-	}
 	free(parents);
 
 	strbuf_release(&namebuf);

Re: [PATCH v3 2/3] sha1_name: get_sha1_with_context learns to follow symlinks

[Junio C Hamano]

dturner@twopensource.com writes:

> -#define GET_SHA1_QUIETLY        01
> -#define GET_SHA1_COMMIT         02
> -#define GET_SHA1_COMMITTISH     04
> -#define GET_SHA1_TREE          010
> -#define GET_SHA1_TREEISH       020
> -#define GET_SHA1_BLOB	       040
> -#define GET_SHA1_ONLY_TO_DIE 04000
> +#define GET_SHA1_QUIETLY           01
> +#define GET_SHA1_COMMIT            02
> +#define GET_SHA1_COMMITTISH        04
> +#define GET_SHA1_TREE             010
> +#define GET_SHA1_TREEISH          020
> +#define GET_SHA1_BLOB             040
> +#define GET_SHA1_FOLLOW_SYMLINKS 0100
> +#define GET_SHA1_ONLY_TO_DIE    04000

There is nothing wrong per-se, but this effort for aligning looks
amusing ;-) Perhaps the next person who wants to mimick this pattern
will order their constants in such a way that gives a shoter code to
a symbol with a longer name?

> diff --git a/sha1_name.c b/sha1_name.c
> index 6d10f05..325f666 100644
> --- a/sha1_name.c
> +++ b/sha1_name.c
> @@ -1434,15 +1434,22 @@ static int get_sha1_with_context_1(const char *name,
>  			new_filename = resolve_relative_path(filename);
>  			if (new_filename)
>  				filename = new_filename;
> -			ret = get_tree_entry(tree_sha1, filename, sha1, &oc->mode);
> -			if (ret && only_to_die) {
> -				diagnose_invalid_sha1_path(prefix, filename,
> -							   tree_sha1,
> -							   name, len);
> +			if (flags & GET_SHA1_FOLLOW_SYMLINKS) {
> +				ret = get_tree_entry_follow_symlinks(tree_sha1,
> +					filename, sha1, &oc->symlink_path,
> +					&oc->mode);
> +			} else {
> +				ret = get_tree_entry(tree_sha1, filename,
> +						     sha1, &oc->mode);
> +				if (ret && only_to_die) {
> +					diagnose_invalid_sha1_path(prefix,
> +								   filename,
> +								   tree_sha1,
> +								   name, len);
> +				}
>  			}

> -			hashcpy(oc->tree, tree_sha1);
>  			strlcpy(oc->path, filename, sizeof(oc->path));
> -
> +			hashcpy(oc->tree, tree_sha1);

Did the order and additional blank line matter here?  I think you'd
prefer to keep these two lines as before...

>  			free(new_filename);
>  			return ret;
>  		} else {
> @@ -1469,5 +1476,7 @@ void maybe_die_on_misspelt_object_name(const char *name, const char *prefix)
>  
>  int get_sha1_with_context(const char *str, unsigned flags, unsigned char *sha1, struct object_context *orc)
>  {
> +	if (flags & GET_SHA1_FOLLOW_SYMLINKS && flags & GET_SHA1_ONLY_TO_DIE)
> +		die("BUG: incompatible flags for get_sha1_with_context");
>  	return get_sha1_with_context_1(str, flags, NULL, sha1, orc);
>  }

Other than that, the patch looks good.

Thanks.

Re: [PATCH v3 3/3] cat-file: add --follow-symlinks to --batch

[David Turner]

On Sun, 2015-05-10 at 09:06 +0200, Johannes Sixt wrote:
> > +	ln -s loop2 loop1 &&
> > +	git add . &&
> > +	git commit -am "test"
> > +'
> 
> These tests will fail on a file system that does not support symbolic 
> links, such as on Windows. Would you please separate the test cases 
> (that come after the setup) into two groups:
> 
> 1. Those that inspect the filesystem and expect a symbolic link. Protect 
> these tests with a SYMLINKS prerequisite.

I believe that none of these require that.

> Note that you do not require a symlink enabled file system to generate a 
> repository with symlinks, i.e., you don't have to protect the setup code 
> with SYMLINKS. For this, you can use 'test_ln_s_add' instead of the 
> above sequence of 'ln -s' followed by a single 'git add .'.

Will fix, thanks.

> > +
> > +echo $hello_sha1 blob $hello_size > found
> 
> This seems to be used only in the next test. Please move it inside 
> test_expect_success.

This is used in a number of tests, e.g this one:

> > +test_expect_success 'git cat-file --batch-check --follow-symlinks works for in-repo, same-dir links' '
> > +	echo HEAD:same-dir-link | git cat-file --batch-check --follow-symlinks > actual &&
> > +	test_cmp found actual
> > +'

Re: [PATCH v3 3/3] cat-file: add --follow-symlinks to --batch

[Junio C Hamano]

David Turner <dturner@twopensource.com> writes:

> On Sun, 2015-05-10 at 09:06 +0200, Johannes Sixt wrote:
>> > +	ln -s loop2 loop1 &&
>> > +	git add . &&
>> > +	git commit -am "test"
>> > +'
>> 
>> These tests will fail on a file system that does not support symbolic 
>> links, such as on Windows. Would you please separate the test cases 
>> (that come after the setup) into two groups:
>> 
>> 1. Those that inspect the filesystem and expect a symbolic link. Protect 
>> these tests with a SYMLINKS prerequisite.
>
> I believe that none of these require that.
>
>> Note that you do not require a symlink enabled file system to generate a 
>> repository with symlinks, i.e., you don't have to protect the setup code 
>> with SYMLINKS. For this, you can use 'test_ln_s_add' instead of the 
>> above sequence of 'ln -s' followed by a single 'git add .'.
>
> Will fix, thanks.

Yeah, thanks. There doesn't seem to be any reason to forbid this new
feature from being used on symlink-challenged filesystem (after all,
"cat-file --batch" should run fine in a bare repository) and the
suggestion makes sens to me.

>> > +
>> > +echo $hello_sha1 blob $hello_size > found
>> 
>> This seems to be used only in the next test. Please move it inside 
>> test_expect_success.
>
> This is used in a number of tests, e.g this one:

Perhaps then the preparetion of 'found' is part of this thing:

    test_expect_success 'prep for symlink tests' '

A micronit on style; please drop SP between redirection and its
target (but have one before redirection), i.e.

	echo ... >found
	command <input

Thanks.

>
>> > +test_expect_success 'git cat-file --batch-check --follow-symlinks
>> > works for in-repo, same-dir links' '
>> > +	echo HEAD:same-dir-link | git cat-file --batch-check --follow-symlinks > actual &&
>> > +	test_cmp found actual
>> > +'