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

Re: [PATCH 09/14] tree-diff: inline path_appendnew()

From
Junio C Hamano <gitster@pobox.com>
Date
Jan 11, 2025, 00:41 UTC
Message-ID
<xmqqzfjyb2sc.fsf@gitster.g>
In-Reply-To
<20250109084944.GI2748836@coredump.intra.peff.net>
Jeff King <peff@peff.net> writes:
Show 9 quoted lines
> Our path_appendnew() has been simplified to the point that it is mostly
> just implementing combine_diff_path_new(), plus setting the "next"
> pointer. Since there's only one caller, let's replace it completely with
> a call to that helper function.
>
> Signed-off-by: Jeff King <peff@peff.net>
> ---
>  tree-diff.c | 31 ++++---------------------------
>  1 file changed, 4 insertions(+), 27 deletions(-)
Very nice, indeed.
Show 37 quoted lines
> -static struct combine_diff_path *path_appendnew(struct combine_diff_path *last,
> -	int nparent, const char *path, size_t len,
> -	unsigned mode, const struct object_id *oid)
> -{
> -	struct combine_diff_path *p;
> -	size_t alloclen = combine_diff_path_size(nparent, len);
> -
> -	p = xmalloc(alloclen);
> -	p->next = NULL;
> -	last->next = p;
> -
> -	p->path = (char *)&(p->parent[nparent]);
> -	memcpy(p->path, path, len);
> -	p->path[len] = 0;
> -	p->mode = mode;
> -	oidcpy(&p->oid, oid ? oid : null_oid());
> -
> -	memset(p->parent, 0, sizeof(p->parent[0]) * nparent);
> -
> -	return p;
> -}
> -
>  /*
>   * new path should be added to combine diff
>   *
> @@ -206,7 +180,10 @@ static struct combine_diff_path *emit_path(struct combine_diff_path *p,
>  		struct combine_diff_path *pprev = p;
>  
>  		strbuf_add(base, path, pathlen);
> -		p = path_appendnew(p, nparent, base->buf, base->len, mode, oid);
> +		p = combine_diff_path_new(base->buf, base->len, mode,
> +					  oid ? oid : null_oid(),
> +					  nparent);
> +		pprev->next = p;
>  		strbuf_setlen(base, old_baselen);
>  
>  		for (i = 0; i < nparent; ++i) {
Previous: Jeff KingNext: Jeff King
Message 32 of 38 in “[BUGREPORT] git diff-tree --cc SEGFAUTs”
  1. Wink SavilleJan 3, 2025
  2. Jeff KingJan 3, 2025
  3. Wink SavilleJan 3, 2025
  4. Jeff KingJan 4, 2025
  5. Junio C HamanoJan 4, 2025
  6. Jeff KingJan 4, 2025
  7. Wink SavilleJan 4, 2025
  8. Wink SavilleJan 5, 2025
  9. 0/14 combine-diff cleanupsJeff King, Jan 9, 2025
  10. 01/14 run_diff_files(): delay allocation of combine_diff_pathJeff King, Jan 9, 2025
  11. Junio C HamanoJan 9, 2025
  12. 02/14 combine-diff: add combine_diff_path_new()Jeff King, Jan 9, 2025
  13. Junio C HamanoJan 9, 2025
  14. Patrick SteinhardtJan 13, 2025
  15. Jeff KingJan 14, 2025
  16. 03/14 tree-diff: clear parent array in path_appendnew()Jeff King, Jan 9, 2025
  17. Junio C HamanoJan 9, 2025
  18. Jeff KingJan 10, 2025
  19. 04/14 combine-diff: use pointer for parent pathsJeff King, Jan 9, 2025
  20. Junio C HamanoJan 9, 2025
  21. 05/14 diff: add a comment about combine_diff_path.parent.pathJeff King, Jan 9, 2025
  22. Patrick SteinhardtJan 13, 2025
  23. 06/14 run_diff_files(): de-mystify the size of combine_diff_path structJeff King, Jan 9, 2025
  24. Junio C HamanoJan 10, 2025
  25. 07/14 tree-diff: drop path_appendnew() alloc optimizationJeff King, Jan 9, 2025
  26. Patrick SteinhardtJan 13, 2025
  27. Jeff KingJan 14, 2025
  28. 08/14 tree-diff: pass whole path string to path_appendnew()Jeff King, Jan 9, 2025
  29. Patrick SteinhardtJan 13, 2025
  30. Jeff KingJan 14, 2025
  31. 09/14 tree-diff: inline path_appendnew()Jeff King, Jan 9, 2025
  32. Junio C HamanoJan 11, 2025
  33. 10/14 combine-diff: drop public declaration of combine_diff_path_size()Jeff King, Jan 9, 2025
  34. 11/14 tree-diff: drop list-tail argument to diff_tree_paths()Jeff King, Jan 9, 2025
  35. Junio C HamanoJan 18, 2025
  36. 12/14 tree-diff: use the name "tail" to refer to list tailJeff King, Jan 9, 2025
  37. 13/14 tree-diff: simplify emit_path() list managementJeff King, Jan 9, 2025
  38. 14/14 tree-diff: make list tail-passing more explicitJeff King, Jan 9, 2025

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.