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

Re: [PATCH v2 2/4] combine-diff.c: refactor: extract insert_path()

From
Junio C Hamano <gitster@pobox.com>
Date
Apr 11, 2015, 20:14 UTC
Message-ID
<xmqqfv865snv.fsf@gitster.dls.corp.google.com>
In-Reply-To
<1428076716-4449-3-git-send-email-max@max630.net>
Max Kirillov <max@max630.net> writes:
Show 14 quoted lines
> Signed-off-by: Max Kirillov <max@max630.net>
> ---
>  combine-diff.c | 43 ++++++++++++++++++++++++-------------------
>  1 file changed, 24 insertions(+), 19 deletions(-)
>
> diff --git a/combine-diff.c b/combine-diff.c
> index 8eb7278..a236bb5 100644
> --- a/combine-diff.c
> +++ b/combine-diff.c
> @@ -22,6 +22,28 @@ static int compare_paths(const struct combine_diff_path *one,
>  				 two->path, strlen(two->path), two->mode);
>  }
>  
> +static void insert_path(struct combine_diff_path **pos, const char* path, int n, int num_parent, struct diff_filepair *queue_item)

This is overlong (and I wonder why I am not seeing the linewrap problem with this one). I'd suggest to split them perhaps in the same way that compare_paths() match_string_spaces() and other existing functions are defined?

Also the pointer-asterisk sticks to the variable name, not type, i.e.

	static void insert_path(struct combine_diff_path **pos, const char *path,
				int n, int num_parent,
                                struct diff_filepair *queue_item)
> +{
Previous: Max KirillovNext: Max Kirillov
Message 21 of 25 in “diff --cc: relax path filtering”
  1. 0/4 diff --cc: relax path filteringMax Kirillov, Apr 2, 2015
  2. 1/4 Add test for showing discarded changes with diff --ccMax Kirillov, Apr 2, 2015
  3. Junio C HamanoApr 2, 2015
  4. Max KirillovApr 3, 2015
  5. 2/4 combine-diff.c: refactor: extract insert_path()Max Kirillov, Apr 2, 2015
  6. 3/4 diff --cc: relax too strict paths pickingMax Kirillov, Apr 2, 2015
  7. Junio C HamanoApr 2, 2015
  8. 4/4 t4059: rewrite to be adaptive to hunk filteringMax Kirillov, Apr 2, 2015
  9. Jeff KingApr 2, 2015
  10. Max KirillovApr 3, 2015
  11. 0/4 diff --cc: relax path filteringMax Kirillov, Apr 3, 2015
  12. 1/4 t4059: test 'diff --cc' with a change from only few parentsMax Kirillov, Apr 3, 2015
  13. Junio C HamanoApr 11, 2015
  14. Junio C HamanoApr 11, 2015
  15. Junio C HamanoApr 11, 2015
  16. Max KirillovApr 12, 2015
  17. Junio C HamanoApr 12, 2015
  18. Max KirillovApr 14, 2015
  19. combine-diff.c: make intersect_paths() behave like hunk filteringMax Kirillov, Apr 14, 2015
  20. 2/4 combine-diff.c: refactor: extract insert_path()Max Kirillov, Apr 3, 2015
  21. Junio C HamanoApr 11, 2015
  22. 3/4 diff --cc: relax too strict paths pickingMax Kirillov, Apr 3, 2015
  23. 4/4 t4059: rewrite to be adaptive to hunk filteringMax Kirillov, Apr 3, 2015
  24. Junio C HamanoApr 12, 2015
  25. Max KirillovApr 14, 2015

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.