git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 2/4] tree-diff: convert diff_root_tree_sha1() to just call diff_tree_sha1 with old=NULL

From
Kirill Smelkov <kirr@mns.spb.ru>
Date
Feb 5, 2014, 16:57 UTC
Message-ID
<bac523d0d3c0b8d91450cc08c859f214bc97e59a.1391619218.git.kirr@mns.spb.ru>
In-Reply-To
<cover.1391619218.git.kirr@mns.spb.ru>

Now since diff_tree_sha1 understands NULL for both old and new, we could indicate an empty tree for root commit by providing just NULL for old sha1.

Signed-off-by: Kirill Smelkov <kirr@mns.spb.ru>
---
 tree-diff.c | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)
diff --git a/tree-diff.c b/tree-diff.c
index f438478..6d82a3f 100644
--- a/tree-diff.c
+++ b/tree-diff.c
@@ -304,18 +304,5 @@ int diff_tree_sha1(const unsigned char *old, const unsigned char *new, const cha
 
 int diff_root_tree_sha1(const unsigned char *new, const char *base, struct diff_options *opt)
 {
-	int retval;
-	void *tree;
-	unsigned long size;
-	struct tree_desc empty, real;
-
-	tree = read_object_with_reference(new, tree_type, &size, NULL);
-	if (!tree)
-		die("unable to read root tree (%s)", sha1_to_hex(new));
-	init_tree_desc(&real, tree, size);
-
-	init_tree_desc(&empty, "", 0);
-	retval = diff_tree(&empty, &real, base, opt);
-	free(tree);
-	return retval;
+	return diff_tree_sha1(NULL, new, base, opt);
 }
-- 
1.9.rc1.181.g641f458
Previous: Kirill SmelkovNext: Kirill Smelkov
Message 3 of 10 in “Teach diff_tree_sha1() to accept NULL sha1 for empty trees”
  1. 0/4 Teach diff_tree_sha1() to accept NULL sha1 for empty treesKirill Smelkov, Feb 5, 2014
  2. 1/4 tree-diff: allow diff_tree_sha1 to accept NULL sha1Kirill Smelkov, Feb 5, 2014
  3. 2/4 tree-diff: convert diff_root_tree_sha1() to just call diff_tree_sha1 with old=NULLKirill Smelkov, Feb 5, 2014
  4. 3/4 line-log: convert to using diff_tree_sha1()Kirill Smelkov, Feb 5, 2014
  5. Thomas RastFeb 6, 2014
  6. Junio C HamanoFeb 6, 2014
  7. 4/4 revision: convert to using diff_tree_sha1()Kirill Smelkov, Feb 5, 2014
  8. Jeff KingFeb 5, 2014
  9. Jeff KingFeb 5, 2014
  10. Junio C HamanoFeb 5, 2014

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.