Merge branch 'tl/ls-tree-oid-only'

gitster · gitster · commit 07330a41d66a · 2022-04-06T15:21:59.000-07:00
"git ls-tree" learns "--oid-only" option, similar to "--name-only",
and more generalized "--format" option.
source: &lt;cover.1648026472.git.dyroneteng@gmail.com&gt;

* tl/ls-tree-oid-only:
  ls-tree: `-l` should not imply recursive listing
diff --git a/builtin/ls-tree.c b/builtin/ls-tree.c
@@ -255,7 +255,7 @@ static int show_tree_long(const struct object_id *oid, struct strbuf *base,
 	printf("%06o %s %s %7s\t", data.mode, type_name(data.type),
 	       find_unique_abbrev(data.oid, abbrev), size_text);
 	show_tree_common_default_long(base, pathname, data.base->len);
-	return 1;
+	return recurse;
 }
 
 static int show_tree_name_only(const struct object_id *oid, struct strbuf *base,

Original file line number	Diff line number	Diff line change
`@@ -255,7 +255,7 @@ static int show_tree_long(const struct object_id oid, struct strbuf base,`
`255`	`255`	`printf("%06o %s %s %7s\t", data.mode, type_name(data.type),`
`256`	`256`	`find_unique_abbrev(data.oid, abbrev), size_text);`
`257`	`257`	`show_tree_common_default_long(base, pathname, data.base->len);`
`258`		`- return 1;`
	`258`	`+ return recurse;`
`259`	`259`	`}`
`260`	`260`
`261`	`261`	`static int show_tree_name_only(const struct object_id oid, struct strbuf base,`