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

Re: [PATCH v8 4/4] branch: let --delete-integrated find branches merged onto changed files

From
Junio C Hamano <gitster@pobox.com>
Date
Nov 18, 2026, 23:05 UTC
Message-ID
<xmqqik1t2119.fsf@gitster.g>
In-Reply-To
<22658105edeacf296a18373400e7b35141e053ef.1794921876.git.gitgitgadget@gmail.com>
"Harald Nordgren via GitGitGadget" <gitgitgadget@gmail.com> writes:
Show 9 quoted lines
> @@ -888,6 +897,8 @@ static void collect_branch_changes(struct landing_search *search,
>  			   search->changes_alloc);
>  		change = &search->changes[search->changes_nr++];
>  		change->path = xstrdup(p->two->path);
> +		oidcpy(&change->base_oid, DIFF_FILE_VALID(p->one) ?
> +		       &p->one->oid : null_oid(the_hash_algo));
>  		oidcpy(&change->branch_oid, DIFF_FILE_VALID(p->two) ?
>  		       &p->two->oid : null_oid(the_hash_algo));
>  		change->branch_mode = p->two->mode;

Mental note. We are recording the mode in the "branch", but never record the mode of the path in the base here.

Show 13 quoted lines
> @@ -895,25 +906,65 @@ static void collect_branch_changes(struct landing_search *search,
>  	diff_flush(&diffopt);
>  }
>  
> +static int merge_keeps_upstream(const struct branch_change *change)
> +{
> +	mmfile_t base, upstream, branch;
> +	mmfile_t result = { 0 };
> +	int ret;
> +
> +	read_mmblob(&base, the_repository->objects, &change->base_oid);
> +	read_mmblob(&upstream, the_repository->objects, &change->upstream_oid);
> +	read_mmblob(&branch, the_repository->objects, &change->branch_oid);

Imagine that a path that originally was a gitlink has been replaced with different regular files on our branch and the upstream. If this function ever gets called on such a path from changes_landed(), the base_oid would record the submodule's commit object name, and read_mmblob() would probably crash.

Show 33 quoted lines
> +	ret = ll_merge(&result, change->path, &base, "base",
> +		       &upstream, "upstream", &branch, "branch",
> +		       the_repository->index, NULL) == LL_MERGE_OK &&
> +	      result.size == upstream.size &&
> +	      !memcmp(result.ptr, upstream.ptr, upstream.size);
> +
> +	free(base.ptr);
> +	free(upstream.ptr);
> +	free(branch.ptr);
> +	free(result.ptr);
> +	return ret;
> +}
> +
> +static enum change_state change_state_at(struct branch_change *change,
> +					 struct commit *commit)
>  {
>  	unsigned short mode;
>  
>  	if (get_tree_entry(the_repository, get_commit_tree_oid(commit),
> +			   change->path, &change->upstream_oid, &mode))
> +		return is_null_oid(&change->branch_oid) ?
> +			CHANGE_LANDED : CHANGE_MISSING;
> +	if (oideq(&change->upstream_oid, &change->branch_oid))
> +		return mode == change->branch_mode ?
> +			CHANGE_LANDED : CHANGE_MISSING;
>
> +	if (is_null_oid(&change->base_oid) ||
> +	    is_null_oid(&change->branch_oid) ||
> +	    oideq(&change->upstream_oid, &change->base_oid) ||
> +	    mode != change->branch_mode || !S_ISREG(mode))
> +		return CHANGE_MISSING;
> +	return CHANGE_NEEDS_MERGE;
>  }

Now, if a gitlink was turned into different regular files, as object names in upstream/branch/base are all different, none of them is null_oid, and as we saw earlier, branch_mode is from p->two->mode found in collect_branch_changes(), and mode would also be for the regular file. As the mode is the same, we end up returning CHANGE_NEEDS_NERGE from here. Which would cause ...

Show 19 quoted lines
>  static int changes_landed(struct landing_search *search,
>  			  struct commit *commit)
>  {
> -	for (size_t i = 0; i < search->changes_nr; i++)
> -		if (!change_landed(&search->changes[i], commit))
> +	for (size_t i = 0; i < search->changes_nr; i++) {
> +		struct branch_change *change = &search->changes[i];
> +
> +		change->state = change_state_at(change, commit);
> +		if (change->state == CHANGE_MISSING)
>  			return 0;
> +	}
> +	for (size_t i = 0; i < search->changes_nr; i++) {
> +		struct branch_change *change = &search->changes[i];
> +
> +		if (change->state == CHANGE_NEEDS_MERGE &&
> +		    !merge_keeps_upstream(change))
> +			return 0;
> +	}

... this code to call merge_keeps_upstream(), causing read_mmfile() on the gitlink commit from submodule object database, leading to a crash, no?

Or am I misreading the code flow?
>  	return 1;
>  }
Previous: Harald Nordgren via GitGitGadgetNext: Jasper Mayone
Message 92 of 99 in “branch: let --delete-merged find squash merged branches”
  1. branch: let --delete-merged find squash merged branchesHarald Nordgren via GitGitGadget, Sep 29, 2026
  2. Kristoffer HaugsbakkSep 29, 2026
  3. Harald NordgrenSep 29, 2026
  4. Kristoffer HaugsbakkSep 29, 2026
  5. D. Ben KnobleSep 29, 2026
  6. Kristoffer HaugsbakkSep 29, 2026
  7. D. Ben KnobleSep 29, 2026
  8. Harald NordgrenSep 29, 2026
  9. Harald NordgrenSep 29, 2026
  10. D. Ben KnobleSep 29, 2026
  11. Harald NordgrenSep 29, 2026
  12. Phillip WoodOct 4, 2026
  13. Harald NordgrenOct 4, 2026
  14. Phillip WoodOct 8, 2026
  15. Harald NordgrenOct 8, 2026
  16. Kristoffer HaugsbakkOct 9, 2026
  17. Harald NordgrenOct 9, 2026
  18. Harald NordgrenOct 9, 2026
  19. Phillip WoodOct 9, 2026
  20. Phillip WoodOct 9, 2026
  21. Harald NordgrenOct 9, 2026
  22. D. Ben KnobleOct 8, 2026
  23. Phillip WoodOct 9, 2026
  24. 0/2 branch: let --delete-merged find squash merged branchesHarald Nordgren via GitGitGadget, Oct 11, 2026
  25. 1/2 branch: let --delete-merged find squash merged branchesHarald Nordgren via GitGitGadget, Oct 11, 2026
  26. 2/2 branch: add --no-squashed to skip the squash searchHarald Nordgren via GitGitGadget, Oct 11, 2026
  27. Junio C HamanoOct 12, 2026
  28. Phillip WoodOct 12, 2026
  29. Harald NordgrenOct 12, 2026
  30. Junio C HamanoOct 12, 2026
  31. Harald NordgrenOct 12, 2026
  32. Junio C HamanoOct 13, 2026
  33. Harald NordgrenOct 17, 2026
  34. Jasper MayoneOct 19, 2026
  35. Harald NordgrenOct 18, 2026
  36. Harald NordgrenOct 12, 2026
  37. D. Ben KnobleOct 12, 2026
  38. 0/3 branch: let --delete-merged find squash merged branchesHarald Nordgren via GitGitGadget, Oct 21, 2026
  39. 1/3 branch: move the deleteMerged opt-out check into a helperHarald Nordgren via GitGitGadget, Oct 21, 2026
  40. 2/3 branch: let --delete-merged find rebase merged branchesHarald Nordgren via GitGitGadget, Oct 21, 2026
  41. 3/3 branch: add --squashed to find squash merged branchesHarald Nordgren via GitGitGadget, Oct 21, 2026
  42. Jasper MayoneOct 21, 2026
  43. Harald NordgrenOct 21, 2026
  44. D. Ben KnobleOct 22, 2026
  45. Harald NordgrenOct 22, 2026
  46. Junio C HamanoOct 22, 2026
  47. Harald NordgrenOct 22, 2026
  48. Junio C HamanoOct 22, 2026
  49. Junio C HamanoOct 22, 2026
  50. Harald NordgrenOct 22, 2026
  51. Jasper MayoneOct 22, 2026
  52. Junio C HamanoOct 22, 2026
  53. Harald NordgrenOct 23, 2026
  54. Harald NordgrenOct 22, 2026
  55. D. Ben KnobleOct 22, 2026
  56. 0/4 branch: let --delete-merged find squash merged branchesHarald Nordgren via GitGitGadget, Oct 26, 2026
  57. 1/4 branch: move the deleteMerged opt-out check into a helperHarald Nordgren via GitGitGadget, Oct 26, 2026
  58. 2/4 branch: let delete_branches() name where a branch landedHarald Nordgren via GitGitGadget, Oct 26, 2026
  59. 3/4 branch: add --delete-integrated to delete rebase and squash merged branchesHarald Nordgren via GitGitGadget, Oct 26, 2026
  60. 4/4 branch: let --delete-integrated find branches merged onto changed filesHarald Nordgren via GitGitGadget, Oct 26, 2026
  61. Jasper MayoneOct 29, 2026
  62. Harald NordgrenOct 29, 2026
  63. 0/4 branch: let --delete-merged find squash merged branchesHarald Nordgren via GitGitGadget, Oct 30, 2026
  64. 1/4 branch: move the deleteMerged opt-out check into a helperHarald Nordgren via GitGitGadget, Oct 30, 2026
  65. 2/4 branch: let delete_branches() name where a branch landedHarald Nordgren via GitGitGadget, Oct 30, 2026
  66. 3/4 branch: add --delete-integrated to delete rebase and squash merged branchesHarald Nordgren via GitGitGadget, Oct 30, 2026
  67. Junio C HamanoOct 30, 2026
  68. Harald NordgrenOct 31, 2026
  69. 4/4 branch: let --delete-integrated find branches merged onto changed filesHarald Nordgren via GitGitGadget, Oct 30, 2026
  70. Junio C HamanoOct 30, 2026
  71. Harald NordgrenOct 31, 2026
  72. 0/4 branch: let --delete-merged find squash merged branchesHarald Nordgren via GitGitGadget, Nov 1, 2026
  73. 1/4 branch: move the deleteMerged opt-out check into a helperHarald Nordgren via GitGitGadget, Nov 1, 2026
  74. 2/4 branch: let delete_branches() name where a branch landedHarald Nordgren via GitGitGadget, Nov 1, 2026
  75. 3/4 branch: add --delete-integrated to delete rebase and squash merged branchesHarald Nordgren via GitGitGadget, Nov 1, 2026
  76. 4/4 branch: let --delete-integrated find branches merged onto changed filesHarald Nordgren via GitGitGadget, Nov 1, 2026
  77. Harald NordgrenNov 11, 2026
  78. Jasper MayoneNov 11, 2026
  79. Harald NordgrenNov 14, 2026
  80. 0/4 branch: let --delete-merged find squash merged branchesHarald Nordgren via GitGitGadget, Nov 14, 2026
  81. 1/4 branch: move the deleteMerged opt-out check into a helperHarald Nordgren via GitGitGadget, Nov 14, 2026
  82. 2/4 branch: let delete_branches() name where a branch landedHarald Nordgren via GitGitGadget, Nov 14, 2026
  83. 3/4 branch: add --delete-integrated to delete rebase and squash merged branchesHarald Nordgren via GitGitGadget, Nov 14, 2026
  84. 4/4 branch: let --delete-integrated find branches merged onto changed filesHarald Nordgren via GitGitGadget, Nov 14, 2026
  85. Tuomas AholaNov 14, 2026
  86. Jasper MayoneNov 16, 2026
  87. 0/4 branch: let --delete-merged find squash merged branchesHarald Nordgren via GitGitGadget, Nov 17, 2026
  88. 1/4 branch: move the deleteMerged opt-out check into a helperHarald Nordgren via GitGitGadget, Nov 17, 2026
  89. 2/4 branch: let delete_branches() name where a branch landedHarald Nordgren via GitGitGadget, Nov 17, 2026
  90. 3/4 branch: add --delete-integrated to delete rebase and squash merged branchesHarald Nordgren via GitGitGadget, Nov 17, 2026
  91. 4/4 branch: let --delete-integrated find branches merged onto changed filesHarald Nordgren via GitGitGadget, Nov 17, 2026
  92. Junio C HamanoNov 18, 2026
  93. Jasper MayoneNov 19, 2026
  94. 0/4 branch: let --delete-merged find squash merged branchesHarald Nordgren via GitGitGadget, Nov 20, 2026
  95. 1/4 branch: move the deleteMerged opt-out check into a helperHarald Nordgren via GitGitGadget, Nov 20, 2026
  96. Junio C HamanoNov 20, 2026
  97. 2/4 branch: let delete_branches() name where a branch landedHarald Nordgren via GitGitGadget, Nov 20, 2026
  98. 3/4 branch: add --delete-integrated to delete rebase and squash merged branchesHarald Nordgren via GitGitGadget, Nov 20, 2026
  99. 4/4 branch: let --delete-integrated find branches merged onto changed filesHarald Nordgren via GitGitGadget, Nov 20, 2026

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.