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

Re: [PATCH 08/15] merge: handle NULL value for branch.<name>.mergeOptions

From
Junio C Hamano <gitster@pobox.com>
Date
Nov 10, 2026, 16:53 UTC
Message-ID
<xmqqcxsctyow.fsf@gitster.g>
In-Reply-To
<12def237-2d01-404f-b7aa-b4f19e033cdc@gmail.com>
Phillip Wood <phillip.wood123@gmail.com> writes:
Show 19 quoted lines
> Hi Thomas
>
> On 07/11/2026 08:42, Thomas Bachem via GitGitGadget wrote:
>> diff --git a/builtin/merge.c b/builtin/merge.c
>> index 5b4eb23a83..fbabda97f8 100644
>> --- a/builtin/merge.c
>> +++ b/builtin/merge.c
>> @@ -668,6 +668,8 @@ static int git_merge_config(const char *k, const char *v,
>>   	    skip_prefix(k, "branch.", &str) &&
>>   	    skip_prefix(str, branch, &str) &&
>>   	    !strcmp(str, ".mergeoptions")) {
>> +		if (!v)
>> +			return config_error_nonbool(k);
>>   		free(branch_mergeoptions);
>>   		branch_mergeoptions = xstrdup(v);
>>   		return 0;
>
> We treat an empty value differently to a missing value, I'm not sure if 
> that makes sense or not.
Sorry but I do not understand this comment.
	[branch "main"] mergeOptions =
is an explicit "there is no extra options when we make a merge".
	[branch "main"] mergeOptions

is an attempt to set a configuration variable to boolean "true". I am not sure if it helps users to pretend as if the latter were

	[branch "main"] mergeOptions =

if that is what you are hinting. It would confuse them when they see a true boolean variable

	[branch "main"] rebase
and wonder why
	[branch "main"] rebase =
does not behave the same way, no?
Previous: Phillip WoodNext: Phillip Wood
Message 17 of 70 in “Fix segfaults on settings given without a value”
  1. 00/15 Fix segfaults on settings given without a valueThomas Bachem via GitGitGadget, Nov 7, 2026
  2. 01/15 rebase -i: handle NULL value for rebase.missingCommitsCheckThomas Bachem via GitGitGadget, Nov 7, 2026
  3. Phillip WoodNov 9, 2026
  4. Junio C HamanoNov 9, 2026
  5. Thomas BachemNov 9, 2026
  6. 02/15 odb: handle NULL values for core.alternateRefs* configThomas Bachem via GitGitGadget, Nov 7, 2026
  7. 03/15 add-patch: handle NULL value for color slotsThomas Bachem via GitGitGadget, Nov 7, 2026
  8. 04/15 bundle-uri: handle NULL value for fetch.bundleCreationTokenThomas Bachem via GitGitGadget, Nov 7, 2026
  9. Derrick StoleeNov 9, 2026
  10. 05/15 grep: handle NULL value for grep.patternTypeThomas Bachem via GitGitGadget, Nov 7, 2026
  11. 06/15 remote: handle NULL value for remote.<name>.tagOptThomas Bachem via GitGitGadget, Nov 7, 2026
  12. Phillip WoodNov 10, 2026
  13. 07/15 blame: handle NULL values for color.blame.* configThomas Bachem via GitGitGadget, Nov 7, 2026
  14. Phillip WoodNov 10, 2026
  15. 08/15 merge: handle NULL value for branch.<name>.mergeOptionsThomas Bachem via GitGitGadget, Nov 7, 2026
  16. Phillip WoodNov 10, 2026
  17. Junio C HamanoNov 10, 2026
  18. Phillip WoodNov 11, 2026
  19. Ben KnobleNov 11, 2026
  20. Junio C HamanoNov 11, 2026
  21. 09/15 remote: handle NULL value for remotes.<group>Thomas Bachem via GitGitGadget, Nov 7, 2026
  22. 10/15 setup: handle NULL value for safe.bareRepositoryThomas Bachem via GitGitGadget, Nov 7, 2026
  23. 11/15 pseudo-merge: handle NULL value for bitmapPseudoMerge.<name>.patternThomas Bachem via GitGitGadget, Nov 7, 2026
  24. 12/15 scalar: handle NULL value for scalar.repoThomas Bachem via GitGitGadget, Nov 7, 2026
  25. Derrick StoleeNov 9, 2026
  26. 13/15 config: handle NULL value for remote URLs in hasconfig includesThomas Bachem via GitGitGadget, Nov 7, 2026
  27. 14/15 bundle-uri: handle NULL values in bundle listsThomas Bachem via GitGitGadget, Nov 7, 2026
  28. Derrick StoleeNov 9, 2026
  29. 15/15 config: handle NULL values when listing colors and expiry datesThomas Bachem via GitGitGadget, Nov 7, 2026
  30. Derrick StoleeNov 9, 2026
  31. 00/15 Fix segfaults on settings given without a valueThomas Bachem via GitGitGadget, Nov 10, 2026
  32. 01/15 rebase -i: handle NULL value for rebase.missingCommitsCheckThomas Bachem via GitGitGadget, Nov 10, 2026
  33. Phillip WoodNov 10, 2026
  34. 02/15 odb: handle NULL values for core.alternateRefs* configThomas Bachem via GitGitGadget, Nov 10, 2026
  35. 03/15 add-patch: handle NULL value for color slotsThomas Bachem via GitGitGadget, Nov 10, 2026
  36. 04/15 bundle-uri: handle NULL value for fetch.bundleCreationTokenThomas Bachem via GitGitGadget, Nov 10, 2026
  37. 05/15 grep: handle NULL value for grep.patternTypeThomas Bachem via GitGitGadget, Nov 10, 2026
  38. 06/15 remote: handle NULL value for remote.<name>.tagOptThomas Bachem via GitGitGadget, Nov 10, 2026
  39. 07/15 blame: handle NULL values for color.blame.* configThomas Bachem via GitGitGadget, Nov 10, 2026
  40. 08/15 merge: handle NULL value for branch.<name>.mergeOptionsThomas Bachem via GitGitGadget, Nov 10, 2026
  41. 09/15 remote: handle NULL value for remotes.<group>Thomas Bachem via GitGitGadget, Nov 10, 2026
  42. 10/15 setup: handle NULL value for safe.bareRepositoryThomas Bachem via GitGitGadget, Nov 10, 2026
  43. 11/15 pseudo-merge: handle NULL value for bitmapPseudoMerge.<name>.patternThomas Bachem via GitGitGadget, Nov 10, 2026
  44. 12/15 scalar: handle NULL value for scalar.repoThomas Bachem via GitGitGadget, Nov 10, 2026
  45. 13/15 config: handle NULL value for remote URLs in hasconfig includesThomas Bachem via GitGitGadget, Nov 10, 2026
  46. 14/15 bundle-uri: handle NULL values in bundle listsThomas Bachem via GitGitGadget, Nov 10, 2026
  47. Phillip WoodNov 10, 2026
  48. Derrick StoleeNov 10, 2026
  49. 15/15 config: handle NULL values when listing colors and expiry datesThomas Bachem via GitGitGadget, Nov 10, 2026
  50. Phillip WoodNov 10, 2026
  51. Thomas BachemNov 10, 2026
  52. 00/15 Fix segfaults on settings given without a valueThomas Bachem via GitGitGadget, Nov 11, 2026
  53. 01/15 rebase -i: handle NULL value for rebase.missingCommitsCheckThomas Bachem via GitGitGadget, Nov 11, 2026
  54. 02/15 odb: handle NULL values for core.alternateRefs* configThomas Bachem via GitGitGadget, Nov 11, 2026
  55. 03/15 add-patch: handle NULL value for color slotsThomas Bachem via GitGitGadget, Nov 11, 2026
  56. 04/15 bundle-uri: handle NULL value for fetch.bundleCreationTokenThomas Bachem via GitGitGadget, Nov 11, 2026
  57. 05/15 grep: handle NULL value for grep.patternTypeThomas Bachem via GitGitGadget, Nov 11, 2026
  58. 06/15 remote: handle NULL value for remote.<name>.tagOptThomas Bachem via GitGitGadget, Nov 11, 2026
  59. 07/15 blame: handle NULL values for color.blame.* configThomas Bachem via GitGitGadget, Nov 11, 2026
  60. 08/15 merge: handle NULL value for branch.<name>.mergeOptionsThomas Bachem via GitGitGadget, Nov 11, 2026
  61. 09/15 remote: handle NULL value for remotes.<group>Thomas Bachem via GitGitGadget, Nov 11, 2026
  62. 10/15 setup: handle NULL value for safe.bareRepositoryThomas Bachem via GitGitGadget, Nov 11, 2026
  63. 11/15 pseudo-merge: handle NULL value for bitmapPseudoMerge.<name>.patternThomas Bachem via GitGitGadget, Nov 11, 2026
  64. 12/15 scalar: handle NULL value for scalar.repoThomas Bachem via GitGitGadget, Nov 11, 2026
  65. 13/15 config: handle NULL value for remote URLs in hasconfig includesThomas Bachem via GitGitGadget, Nov 11, 2026
  66. 14/15 bundle-uri: handle NULL values in bundle listsThomas Bachem via GitGitGadget, Nov 11, 2026
  67. 15/15 config: handle NULL values when listing colors and expiry datesThomas Bachem via GitGitGadget, Nov 11, 2026
  68. Phillip WoodNov 12, 2026
  69. Derrick StoleeNov 12, 2026
  70. Junio C HamanoNov 12, 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.