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

Re: [PATCH 1/2] tree-diff: rework diff_tree() to generate diffs for multiparent cases as well

From
Junio C Hamano <gitster@pobox.com>
Date
Feb 13, 2014, 19:51 UTC
Message-ID
<xmqqbnyalrk8.fsf@gitster.dls.corp.google.com>
In-Reply-To
<1dd9ca564e00ef235875aae4944675f53dcd25a3.1392299516.git.kirr@mns.spb.ru>
Kirill Smelkov <kirr@mns.spb.ru> writes:
> +		/* until we go to it next round, .next holds how many bytes we
> +		 * allocated (for faster realloc - we don't need copying old data).
> +		 */
> +		p->next = (struct combine_diff_path *)alloclen;
I am getting this here:

tree-diff.c: In function '__path_appendnew': tree-diff.c:140:13: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast]

Previous: Kirill SmelkovNext: Kirill Smelkov
Message 3 of 10 in “Multiparent diff tree-walker + combine-diff speedup”
  1. 0/2 Multiparent diff tree-walker + combine-diff speedupKirill Smelkov, Feb 13, 2014
  2. 1/2 tree-diff: rework diff_tree() to generate diffs for multiparent cases as wellKirill Smelkov, Feb 13, 2014
  3. Junio C HamanoFeb 13, 2014
  4. Kirill SmelkovFeb 14, 2014
  5. Junio C HamanoFeb 14, 2014
  6. Kirill SmelkovFeb 16, 2014
  7. Junio C HamanoFeb 18, 2014
  8. 2/2 combine-diff: speed it up, by using multiparent diff tree-walker directlyKirill Smelkov, Feb 13, 2014
  9. Junio C HamanoFeb 13, 2014
  10. Kirill SmelkovFeb 14, 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.