# (rework) [PATCH 3/4] Accept commit in some places when tree is needed. 4 messages from 2005-04-21 to 2005-04-21. Participants: Junio C Hamano, Linus Torvalds. Thread: https://gitlist.dev/t/184 ## Junio C Hamano, 2005-04-21 00:23 Subject: (rework) [PATCH 3/4] Accept commit in some places when tree is needed. Message-ID: <7vvf6hgeqj.fsf@assigned-by-dhcp.cox.net> URL: https://gitlist.dev/e/7vvf6hgeqj.fsf%40assigned-by-dhcp.cox.net ``` 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 --- ls-tree.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) ls-tree.c: c063640c114634dc7cf950ce44863dd17ddf83c1 --- 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, 2005-04-21 00:43 Subject: Re: (rework) [PATCH 3/4] Accept commit in some places when tree is needed. Message-ID: <7vk6mxgds8.fsf@assigned-by-dhcp.cox.net> URL: https://gitlist.dev/e/7vk6mxgds8.fsf%40assigned-by-dhcp.cox.net In-Reply-To: <7vvf6hgeqj.fsf@assigned-by-dhcp.cox.net> ``` >>>>> "JCH" == Junio C Hamano 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, 2005-04-21 01:09 Subject: Re: (rework) [PATCH 3/4] Accept commit in some places when tree is needed. Message-ID: URL: https://gitlist.dev/e/Pine.LNX.4.58.0504201807320.2344%40ppc970.osdl.org In-Reply-To: <7vk6mxgds8.fsf@assigned-by-dhcp.cox.net> ``` 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, 2005-04-21 02:32 Subject: Re: (rework) [PATCH 3/4] Accept commit in some places when tree is needed. Message-ID: <7v7jiwhnac.fsf@assigned-by-dhcp.cox.net> URL: https://gitlist.dev/e/7v7jiwhnac.fsf%40assigned-by-dhcp.cox.net In-Reply-To: ``` >>>>> "LT" == Linus Torvalds 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 --- --- l/sha1_file.c 2005-04-20 19:00:38.000000000 -0700 +++ k/sha1_file.c 2005-04-20 18:14:34.000000000 -0700 @@ -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; ```