threads / discuss / 184

patch, 4 parts(rework) [PATCH 3/4] Accept commit in some places when tree is needed.

Subject: (rework) [PATCH 3/4] Accept commit in some places when tree is needed.

## tl;dr

4 messages between Apr 21, 2005 and Apr 21, 2005. Diffs are folded; open one to read it.

replies: 3people: 2as markdown or json

Junio C Hamano· Apr 21, 2005, 00:23 UTC · lore

Updates ls-tree.c to use read_tree_with_tree_or_commit_sha1() function. The command can take either tree or commit IDs with this patch.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

 ls-tree.c |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

ls-tree.c: c063640c114634dc7cf950ce44863dd17ddf83c1

Show changes to ls-tree.c +5 −6

--- a/ls-tree.c
+++ b/ls-tree.c
@@ -24,9 +24,9 @@ static void print_path_prefix(struct pat
 }
 
 static void list_recursive(void *buffer,
-			  unsigned char *type,
-			  unsigned long size,
-			  struct path_prefix *prefix)
+			   const unsigned char *type,
+			   unsigned long size,
+			   struct path_prefix *prefix)
 {
 	struct path_prefix this_prefix;
 	this_prefix.prev = prefix;
@@ -72,12 +72,11 @@ static int list(unsigned char *sha1)
 {
 	void *buffer;
 	unsigned long size;
-	char type[20];
 
-	buffer = read_sha1_file(sha1, type, &size);
+	buffer = read_tree_with_tree_or_commit_sha1(sha1, &size, 0);
 	if (!buffer)
 		die("unable to read sha1 file");
-	list_recursive(buffer, type, size, NULL);
+	list_recursive(buffer, "tree", size, NULL);
 	return 0;
 }

Junio C Hamano· Apr 21, 2005, 00:43 UTC · re: Junio C Hamano · lore

Re: (rework) [PATCH 3/4] Accept commit in some places when tree is needed.

>>>>> "JCH" == Junio C Hamano <junkio@cox.net> writes:

JCH> Updates ls-tree.c to use read_tree_with_tree_or_commit_sha1() JCH> function. The command can take either tree or commit IDs with JCH> this patch.

Sorry, but the numbering is wrong this should have been [4/5] not [3/4]. The contents should be fine, though.

Linus Torvalds· Apr 21, 2005, 01:09 UTC · re: Junio C Hamano · lore

Re: (rework) [PATCH 3/4] Accept commit in some places when tree is needed.

On Wed, 20 Apr 2005, Junio C Hamano wrote:

> 
> Sorry, but the numbering is wrong this should have been [4/5]
> not [3/4].  The contents should be fine, though.

Applied and pushed out.

Btw, I edited your subject lines to make them be more specific to one particular patch.

		Linus

Junio C Hamano· Apr 21, 2005, 02:32 UTC · re: Linus Torvalds · lore

Re: (rework) [PATCH 3/4] Accept commit in some places when tree is needed.

>>>>> "LT" == Linus Torvalds <torvalds@osdl.org> writes:

LT> On Wed, 20 Apr 2005, Junio C Hamano wrote:

>> 
>> Sorry, but the numbering is wrong this should have been [4/5]
>> not [3/4].  The contents should be fine, though.

LT> Applied and pushed out.

Thanks.  I have alreay a bugfix and a half X-<.

---------------------------------------------------------------- [PATCH] Fix read-tree-with-tree-or-commit-sha1 function.

Instead of NULL to signal an error, it was returning a garbage. Also the compiler complains about a type mismatch between signed and unsigned character array. Both are my bad. Sorry.

Signed-off-by: Junio C Hamano <junkio@cox.net> 
---

--- l/sha1_file.c 2005-04-20 19:00:38.000000000 -0700 +++ k/sha1_file.c 2005-04-20 18:14:34.000000000 -0700

Show changes to diff +2 −2

@@ -174,7 +174,7 @@
 	void *buffer;
 	unsigned long isize;
 	int was_commit = 0;
-	char tree_sha1[20];
+	unsigned char tree_sha1[20];
 
 	buffer = read_sha1_file(sha1, type, &isize);
 
@@ -197,7 +197,7 @@
 	 */
 	if (!buffer || strcmp(type, "tree")) {
 		free(buffer);
-		return;
+		return NULL;
 	}
 
 	*size = isize;