Enable auto-merge for meld to follow the vim-diff beharior

From: "lin.sun" <[email protected]>

The mergetool "meld" does NOT merge the no-conflict changes, while the mergetool "vimdiff" will merge the no-conflict parts and highlight the conflict parts.
This patch will make the mergetool "meld" similar to "vimdiff", auto-merge the no-conflict parts, highlight conflict parts.

---
Enable auto-merge for meld to follow the vimdiff beharior

Hi, the mergetool "meld" does NOT merge the no-conflict changes, while the mergetool "vimdiff" will merge the no-conflict changes and highlight the conflict parts. This patch will make the mergetool "meld" similar to "vimdiff", auto-merge the no-conflict changes, highlight conflict parts.

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-781%2Fsunlin7%2Fmaster-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-781/sunlin7/master-v1
Pull-Request: https://github.com/git/git/pull/781

 mergetools/meld | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

index 7a08470f883..318653cc9f7 100644
@@ -10,10 +10,10 @@ merge_cmd () {
 
 	if test "$meld_has_output_option" = true
 	then
-		"$merge_tool_path" --output="$MERGED" \
+		"$merge_tool_path" --auto-merge --output="$MERGED" \
 			"$LOCAL" "$BASE" "$REMOTE"
 	else
-		"$merge_tool_path" "$LOCAL" "$MERGED" "$REMOTE"
+		"$merge_tool_path" --auto-merge "$LOCAL" "$MERGED" "$REMOTE"
 	fi
 }
 

base-commit: 07d8ea56f2ecb64b75b92264770c0a664231ce17

gitgitgadget

Hi Lin,

I'm not familiar with the code so I'll let someone else comment on that. But...

... your name and email in "From:" and "Signed-off-by:" should be the same. So either use "lin.sun" <[email protected]> in both places or use Lin Sun <[email protected]> in both.

Regards,
Pratyush Yadav

From: "lin.sun" <[email protected]>

The mergetool "meld" does NOT merge the no-conflict changes, while the mergetool "vimdiff" will merge the no-conflict parts and highlight the conflict parts.
This patch will make the mergetool "meld" similar to "vimdiff", auto-merge the no-conflict parts, highlight conflict parts.

---
Enable auto-merge for meld to follow the vimdiff beharior

Hi, the mergetool "meld" does NOT merge the no-conflict changes, while the mergetool "vimdiff" will merge the no-conflict changes and highlight the conflict parts. This patch will make the mergetool "meld" similar to "vimdiff", auto-merge the no-conflict changes, highlight conflict parts.

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-781%2Fsunlin7%2Fmaster-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-781/sunlin7/master-v2
Pull-Request: https://github.com/git/git/pull/781

Range-diff vs v1:

1: 739e69e6631 ! 1: 6e98a10bfa9 Enable auto-merge for meld to follow the vim-diff beharior
@@ Commit message
This patch will make the mergetool "meld" similar to "vimdiff", auto-merge the no-conflict parts, highlight conflict parts.

- Signed-off-by: Lin Sun <[email protected]>
+ Signed-off-by: Lin Sun <[email protected]>

## mergetools/meld ##
@@ mergetools/meld: merge_cmd () {

 mergetools/meld | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

index 7a08470f883..318653cc9f7 100644
@@ -10,10 +10,10 @@ merge_cmd () {
 
 	if test "$meld_has_output_option" = true
 	then
-		"$merge_tool_path" --output="$MERGED" \
+		"$merge_tool_path" --auto-merge --output="$MERGED" \
 			"$LOCAL" "$BASE" "$REMOTE"
 	else
-		"$merge_tool_path" "$LOCAL" "$MERGED" "$REMOTE"
+		"$merge_tool_path" --auto-merge "$LOCAL" "$MERGED" "$REMOTE"
 	fi
 }
 

base-commit: 07d8ea56f2ecb64b75b92264770c0a664231ce17

gitgitgadget

From: "lin.sun" <[email protected]>

The mergetool "meld" does NOT merge the no-conflict changes, while the mergetool "vimdiff" will merge the no-conflict parts and highlight the conflict parts.
This patch will make the mergetool "meld" similar to "vimdiff", auto-merge the no-conflict parts, highlight conflict parts.

---
Enable auto-merge for meld to follow the vimdiff beharior

Hi, the mergetool "meld" does NOT merge the no-conflict changes, while the mergetool "vimdiff" will merge the no-conflict changes and highlight the conflict parts. This patch will make the mergetool "meld" similar to "vimdiff", auto-merge the no-conflict changes, highlight conflict parts.

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-781%2Fsunlin7%2Fmaster-v3
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-781/sunlin7/master-v3
Pull-Request: https://github.com/git/git/pull/781

Range-diff vs v2:

1: 6e98a10bfa ! 1: 3b70fd0bfc Enable auto-merge for meld to follow the vim-diff beharior

     @@ Commit message
      
       ## mergetools/meld ##
      @@ mergetools/meld: merge_cmd () {
     + 	then
     + 		check_meld_for_output_version
     + 	fi
     ++	if test -z "${meld_has_auto_merge_option:+set}"
     ++	then
     ++		check_meld_for_auto_merge_version
     ++	fi
     ++
     ++	option_auto_merge=
     ++	if test "$meld_has_auto_merge_option" = true
     ++	then
     ++		option_auto_merge="--auto-merge"
     ++	fi
       
       	if test "$meld_has_output_option" = true
       	then
      -		"$merge_tool_path" --output="$MERGED" \
     -+		"$merge_tool_path" --auto-merge --output="$MERGED" \
     ++		"$merge_tool_path" $option_auto_merge --output="$MERGED" \
       			"$LOCAL" "$BASE" "$REMOTE"
       	else
      -		"$merge_tool_path" "$LOCAL" "$MERGED" "$REMOTE"
     -+		"$merge_tool_path" --auto-merge "$LOCAL" "$MERGED" "$REMOTE"
     ++		"$merge_tool_path" $option_auto_merge "$LOCAL" "$MERGED" "$REMOTE"
       	fi
       }
       
     +@@ mergetools/meld: check_meld_for_output_version () {
     + 		meld_has_output_option=false
     + 	fi
     + }
     ++
     ++# Check whether we should use 'meld --auto-merge ...'
     ++check_meld_for_auto_merge_version () {
     ++	meld_path="$(git config mergetool.meld.path)"
     ++	meld_path="${meld_path:-meld}"
     ++
     ++	if meld_has_auto_merge_option=$(git config --bool mergetool.meld.hasAutoMerge)
     ++	then
     ++		: use configured value
     ++	elif "$meld_path" --help 2>&1 |
     ++		grep -e '--auto-merge' -e '\[OPTION\.\.\.\]' >/dev/null
     ++	then
     ++		: old ones mention --auto-merge and new ones just say OPTION...
     ++		meld_has_auto_merge_option=true
     ++	else
     ++		meld_has_auto_merge_option=false
     ++	fi
     ++}

 mergetools/meld | 32 ++++++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

index 7a08470f88..91b65ff22c 100644
@@ -7,13 +7,23 @@ merge_cmd () {
 	then
 		check_meld_for_output_version
 	fi
+	if test -z "${meld_has_auto_merge_option:+set}"
+	then
+		check_meld_for_auto_merge_version
+	fi
+
+	option_auto_merge=
+	if test "$meld_has_auto_merge_option" = true
+	then
+		option_auto_merge="--auto-merge"
+	fi
 
 	if test "$meld_has_output_option" = true
 	then
-		"$merge_tool_path" --output="$MERGED" \
+		"$merge_tool_path" $option_auto_merge --output="$MERGED" \
 			"$LOCAL" "$BASE" "$REMOTE"
 	else
-		"$merge_tool_path" "$LOCAL" "$MERGED" "$REMOTE"
+		"$merge_tool_path" $option_auto_merge "$LOCAL" "$MERGED" "$REMOTE"
 	fi
 }
 

@@ -34,3 +44,21 @@ check_meld_for_output_version () {
 		meld_has_output_option=false
 	fi
 }
+
+# Check whether we should use 'meld --auto-merge ...'
+check_meld_for_auto_merge_version () {
+	meld_path="$(git config mergetool.meld.path)"
+	meld_path="${meld_path:-meld}"
+
+	if meld_has_auto_merge_option=$(git config --bool mergetool.meld.hasAutoMerge)
+	then
+		: use configured value
+	elif "$meld_path" --help 2>&1 |
+		grep -e '--auto-merge' -e '\[OPTION\.\.\.\]' >/dev/null
+	then
+		: old ones mention --auto-merge and new ones just say OPTION...
+		meld_has_auto_merge_option=true
+	else
+		meld_has_auto_merge_option=false
+	fi
+}

base-commit: 07d8ea56f2ecb64b75b92264770c0a664231ce17

gitgitgadget

Re-sending, as this mail seems to have been dropped by vger.

---------- Forwarded message ---------
From: sunlin via GitGitGadget <[email protected]>
Date: Mon, Jun 29, 2020 at 9:07 AM
Subject: [PATCH v3] Enable auto-merge for meld to follow the vim-diff beharior
To: <[email protected]>
Cc: sunlin <[email protected]>, lin.sun <[email protected]>

From: "lin.sun" <[email protected]>

The mergetool "meld" does NOT merge the no-conflict changes, while the mergetool "vimdiff" will merge the no-conflict parts and highlight the conflict parts.
This patch will make the mergetool "meld" similar to "vimdiff", auto-merge the no-conflict parts, highlight conflict parts.

---
Enable auto-merge for meld to follow the vimdiff beharior

Hi, the mergetool "meld" does NOT merge the no-conflict changes, while the mergetool "vimdiff" will merge the no-conflict changes and highlight the conflict parts. This patch will make the mergetool "meld" similar to "vimdiff", auto-merge the no-conflict changes, highlight conflict parts.

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-781%2Fsunlin7%2Fmaster-v3
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git
pr-git-781/sunlin7/master-v3
Pull-Request: https://github.com/git/git/pull/781

Range-diff vs v2:

1: 6e98a10bfa ! 1: 3b70fd0bfc Enable auto-merge for meld to follow
the vim-diff beharior

     @@ Commit message

       ## mergetools/meld ##
      @@ mergetools/meld: merge_cmd () {
     +  then
     +          check_meld_for_output_version
     +  fi
     ++ if test -z "${meld_has_auto_merge_option:+set}"
     ++ then
     ++         check_meld_for_auto_merge_version
     ++ fi
     ++
     ++ option_auto_merge=
     ++ if test "$meld_has_auto_merge_option" = true
     ++ then
     ++         option_auto_merge="--auto-merge"
     ++ fi

        if test "$meld_has_output_option" = true
        then
      -         "$merge_tool_path" --output="$MERGED" \
     -+         "$merge_tool_path" --auto-merge --output="$MERGED" \
     ++         "$merge_tool_path" $option_auto_merge --output="$MERGED" \
                        "$LOCAL" "$BASE" "$REMOTE"
        else
      -         "$merge_tool_path" "$LOCAL" "$MERGED" "$REMOTE"
     -+         "$merge_tool_path" --auto-merge "$LOCAL" "$MERGED" "$REMOTE"
     ++         "$merge_tool_path" $option_auto_merge "$LOCAL"
"$MERGED" "$REMOTE"
        fi
       }

     +@@ mergetools/meld: check_meld_for_output_version () {
     +          meld_has_output_option=false
     +  fi
     + }
     ++
     ++# Check whether we should use 'meld --auto-merge ...'
     ++check_meld_for_auto_merge_version () {
     ++ meld_path="$(git config mergetool.meld.path)"
     ++ meld_path="${meld_path:-meld}"
     ++
     ++ if meld_has_auto_merge_option=$(git config --bool
mergetool.meld.hasAutoMerge)
     ++ then
     ++         : use configured value
     ++ elif "$meld_path" --help 2>&1 |
     ++         grep -e '--auto-merge' -e '\[OPTION\.\.\.\]' >/dev/null
     ++ then
     ++         : old ones mention --auto-merge and new ones just say OPTION...
     ++         meld_has_auto_merge_option=true
     ++ else
     ++         meld_has_auto_merge_option=false
     ++ fi
     ++}

 mergetools/meld | 32 ++++++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

index 7a08470f88..91b65ff22c 100644
@@ -7,13 +7,23 @@ merge_cmd () {
        then
                check_meld_for_output_version
        fi
+       if test -z "${meld_has_auto_merge_option:+set}"
+       then
+               check_meld_for_auto_merge_version
+       fi
+
+       option_auto_merge=
+       if test "$meld_has_auto_merge_option" = true
+       then
+               option_auto_merge="--auto-merge"
+       fi
 
        if test "$meld_has_output_option" = true
        then
-               "$merge_tool_path" --output="$MERGED" \
+               "$merge_tool_path" $option_auto_merge --output="$MERGED" \
                        "$LOCAL" "$BASE" "$REMOTE"
        else
-               "$merge_tool_path" "$LOCAL" "$MERGED" "$REMOTE"
+               "$merge_tool_path" $option_auto_merge "$LOCAL"

"$MERGED" "$REMOTE"
fi
}

@@ -34,3 +44,21 @@ check_meld_for_output_version () {
meld_has_output_option=false
fi
}
+
+# Check whether we should use 'meld --auto-merge ...' +check_meld_for_auto_merge_version () {
+ meld_path="$(git config mergetool.meld.path)"
+ meld_path="${meld_path:-meld}"
+
+ if meld_has_auto_merge_option=$(git config --bool
mergetool.meld.hasAutoMerge)
+ then
+ : use configured value
+ elif "$meld_path" --help 2>&1 |
+ grep -e '--auto-merge' -e '\[OPTION\.\.\.\]' >/dev/null
+ then
+ : old ones mention --auto-merge and new ones just say OPTION...
+ meld_has_auto_merge_option=true
+ else
+ meld_has_auto_merge_option=false
+ fi
+}

base-commit: 07d8ea56f2ecb64b75b92264770c0a664231ce17 --
gitgitgadget

The way this "name <addr>" is spelled must match the name used on the Signed-off-by: line below.

OK.

Have a blank line between paragraphs here.

Give an order to the codebase to be like so, e.g.:

Make the mergetool used with "meld" backend behave similarly to how "vimdiff" beheaves by telling it to auto-merge parts without conflicts and highlight the parts with conflicts.

or somethin glike that.

That repeats the log message and does not add much useful info.

Sorry for not noticing your reply here earlier. I agree with everything you wrote here, and rescind my earlier sign-off. Combining as you suggested below is best IMO as well.

I like the idea of having it be auto/true/false, and perhaps "auto" would be a sensible default if more users benefit from it than not.

Sunlin, do you have an opinion on what the default should be?

Small sug -- this command substitution doesn't need the enclosing quotes.

	meld_path=$(git config mergetool.meld.path || echo meld)

should be sufficient. Are we okay with || echo meld? If so, it would let us drop this line below.

I'm 100% on board with this suggestion.

Ditto.

David

Hi David, Junio,

Appreciate for your comments, I rewrite the "mergetool/meld" to follow your comments and suggestions.
It will respect the git config first, then detect the options if no configuration for them, and also reduce the subprocess calling. Both the modified-file and patch-file are appended.
Please review again. Thanks

Regards
Lin Sun

From 93ae3ec011e7b55cc9971f91345cb4aab5189cb4 Mon Sep 17 00:00:00 2001
From: "lin.sun" <[email protected]>
Date: Thu, 7 May 2020 07:31:14 +0800
Subject: [PATCH] Enable auto-merge for meld to follow the vim-diff beharior

Make the mergetool used with "meld" backend behave similarly to how "vimdiff" beheaves by telling it to auto-merge parts without conflicts and highlight the parts with conflicts.

---
 mergetools/meld | 73 ++++++++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 57 insertions(+), 16 deletions(-)

index 7a08470..1b92771 100644
@@ -3,34 +3,75 @@ diff_cmd () {
 }
 
 merge_cmd () {
-	if test -z "${meld_has_output_option:+set}"
+	check_meld_for_features
+
+	option_auto_merge=
+	if test "$meld_has_auto_merge_option" = true
 	then
-		check_meld_for_output_version
+		option_auto_merge="--auto-merge"
 	fi
 
 	if test "$meld_has_output_option" = true
 	then
-		"$merge_tool_path" --output="$MERGED" \
+		"$merge_tool_path" $option_auto_merge --output="$MERGED" \
 			"$LOCAL" "$BASE" "$REMOTE"
 	else
-		"$merge_tool_path" "$LOCAL" "$MERGED" "$REMOTE"
+		"$merge_tool_path" $option_auto_merge "$LOCAL" "$MERGED" "$REMOTE"
 	fi
 }
 
-# Check whether we should use 'meld --output <file>'
-check_meld_for_output_version () {
-	meld_path="$(git config mergetool.meld.path)"
-	meld_path="${meld_path:-meld}"
+# Get meld help message
+get_meld_help_msg () {
+	meld_path="$(git config mergetool.meld.path || echo meld)"
+  $meld_path --help 2>&1
+}
 
-	if meld_has_output_option=$(git config --bool mergetool.meld.hasOutput)
+# Check the features and set flags
+check_meld_for_features () {
+	# Check whether we should use 'meld --output <file>'
+	if test -z "${meld_has_output_option:+set}"
 	then
-		: use configured value
-	elif "$meld_path" --help 2>&1 |
-		grep -e '--output=' -e '\[OPTION\.\.\.\]' >/dev/null
+		meld_has_output_option=$(git config --bool mergetool.meld.hasOutput)
+		if test "$meld_has_output_option" = true -o \
+						"$meld_has_output_option" = false
+		then
+			: use configured value
+		else												# treat meld_has_output_option as "auto"
+			if test -z "$meld_help_msg"
+			then
+				meld_help_msg="$(get_meld_help_msg)"
+			fi
+
+			if echo "$meld_help_msg" |
+							grep -e '--output=' -e '\[OPTION\.\.\.\]' >/dev/null
+			then
+				: old ones mention --output and new ones just say OPTION...
+				meld_has_output_option=true
+			else
+				meld_has_output_option=false
+			fi
+		fi
+	fi
+	# Check whether we should use 'meld --auto-merge ...'
+	if test -z "${meld_has_auto_merge_option:+set}"
 	then
-		: old ones mention --output and new ones just say OPTION...
-		meld_has_output_option=true
-	else
-		meld_has_output_option=false
+		meld_has_auto_merge_option=$(git config --bool mergetool.meld.hasAutoMerge)
+		if test "$meld_has_auto_merge_option" = true -o \
+						"$meld_has_auto_merge_option" = false
+		then
+			: use configured value
+		else												# treat meld_has_auto_merge_option as "auto"
+			if test -z "$meld_help_msg"
+			then
+					meld_help_msg="$(get_meld_help_msg)"
+			fi
+
+			if echo "$meld_help_msg" | grep -e '--auto-merge' >/dev/null
+			then
+					meld_has_auto_merge_option=true
+			else
+				meld_has_auto_merge_option=false
+			fi
+		fi
 	fi
 }

2.2.0

The last change also available in https://github.com/git/git/pull/781/files.

The principle I've stuck to running this project for the past years is to avoid hurting 1 user more than trying to please 10 others. As I do not use meld regularly myself, I do not know if there are use cases that are helped by the fact that "--auto-merge" is not the default behaviour among "meld" users (not limited to "users of mergetool with meld backend"). And if there are, suddenly changing the behaviour to those who have happily been using mergetool with meld backend that does not "--auto-merge" can be disservice to our users. Until I hear something along the lines of "Even though meld requires --auto-merge from users merely due to historical reasons, these days everybody hates the fact that it is not the default", I'd recommend against making 'auto' the default on our side, just to be safe, even if our intuition is that majority of users may want the "--auto-merge" behaviour.

But I am not a user of mergetool with meld backend, so...

Thanks.

From: "lin.sun" <[email protected]>

Make the mergetool used with "meld" backend behave similarly to how "vimdiff" beheaves by telling it to auto-merge parts without conflicts and highlight the parts with conflicts.

---
Enable auto-merge for meld to follow the vimdiff beharior

Hi, the mergetool "meld" does NOT merge the no-conflict changes, while the mergetool "vimdiff" will merge the no-conflict changes and highlight the conflict parts. This patch will make the mergetool "meld" similar to "vimdiff", auto-merge the no-conflict changes, highlight conflict parts.

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-781%2Fsunlin7%2Fmaster-v4
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-781/sunlin7/master-v4
Pull-Request: https://github.com/git/git/pull/781

Range-diff vs v3:

1: 3b70fd0bfc ! 1: 93ae3ec011 Enable auto-merge for meld to follow the vim-diff beharior

     @@ Metadata
       ## Commit message ##
          Enable auto-merge for meld to follow the vim-diff beharior
      
     -    The mergetool "meld" does NOT merge the no-conflict changes, while the
     -    mergetool "vimdiff" will merge the no-conflict parts and highlight the
     -    conflict parts.
     -    This patch will make the mergetool "meld" similar to "vimdiff",
     -    auto-merge the no-conflict parts, highlight conflict parts.
     +    Make the mergetool used with "meld" backend behave similarly to
     +    how "vimdiff" beheaves by telling it to auto-merge parts without
     +    conflicts and highlight the parts with conflicts.
      
     -    Signed-off-by: Lin Sun <[email protected]>
     +    Signed-off-by: lin.sun <[email protected]>
      
       ## mergetools/meld ##
     -@@ mergetools/meld: merge_cmd () {
     - 	then
     - 		check_meld_for_output_version
     - 	fi
     -+	if test -z "${meld_has_auto_merge_option:+set}"
     -+	then
     -+		check_meld_for_auto_merge_version
     -+	fi
     +@@ mergetools/meld: diff_cmd () {
     + }
     + 
     + merge_cmd () {
     +-	if test -z "${meld_has_output_option:+set}"
     ++	check_meld_for_features
      +
      +	option_auto_merge=
      +	if test "$meld_has_auto_merge_option" = true
     -+	then
     + 	then
     +-		check_meld_for_output_version
      +		option_auto_merge="--auto-merge"
     -+	fi
     + 	fi
       
       	if test "$meld_has_output_option" = true
       	then
     @@ mergetools/meld: merge_cmd () {
       	fi
       }
       
     -@@ mergetools/meld: check_meld_for_output_version () {
     - 		meld_has_output_option=false
     - 	fi
     - }
     -+
     -+# Check whether we should use 'meld --auto-merge ...'
     -+check_meld_for_auto_merge_version () {
     -+	meld_path="$(git config mergetool.meld.path)"
     -+	meld_path="${meld_path:-meld}"
     +-# Check whether we should use 'meld --output <file>'
     +-check_meld_for_output_version () {
     +-	meld_path="$(git config mergetool.meld.path)"
     +-	meld_path="${meld_path:-meld}"
     ++# Get meld help message
     ++get_meld_help_msg () {
     ++	meld_path="$(git config mergetool.meld.path || echo meld)"
     ++  $meld_path --help 2>&1
     ++}
     + 
     +-	if meld_has_output_option=$(git config --bool mergetool.meld.hasOutput)
     ++# Check the features and set flags
     ++check_meld_for_features () {
     ++	# Check whether we should use 'meld --output <file>'
     ++	if test -z "${meld_has_output_option:+set}"
     + 	then
     +-		: use configured value
     +-	elif "$meld_path" --help 2>&1 |
     +-		grep -e '--output=' -e '\[OPTION\.\.\.\]' >/dev/null
     ++		meld_has_output_option=$(git config --bool mergetool.meld.hasOutput)
     ++		if test "$meld_has_output_option" = true -o \
     ++						"$meld_has_output_option" = false
     ++		then
     ++			: use configured value
     ++		else												# treat meld_has_output_option as "auto"
     ++			if test -z "$meld_help_msg"
     ++			then
     ++				meld_help_msg="$(get_meld_help_msg)"
     ++			fi
      +
     -+	if meld_has_auto_merge_option=$(git config --bool mergetool.meld.hasAutoMerge)
     -+	then
     -+		: use configured value
     -+	elif "$meld_path" --help 2>&1 |
     -+		grep -e '--auto-merge' -e '\[OPTION\.\.\.\]' >/dev/null
     -+	then
     -+		: old ones mention --auto-merge and new ones just say OPTION...
     -+		meld_has_auto_merge_option=true
     -+	else
     -+		meld_has_auto_merge_option=false
     ++			if echo "$meld_help_msg" |
     ++							grep -e '--output=' -e '\[OPTION\.\.\.\]' >/dev/null
     ++			then
     ++				: old ones mention --output and new ones just say OPTION...
     ++				meld_has_output_option=true
     ++			else
     ++				meld_has_output_option=false
     ++			fi
     ++		fi
      +	fi
     -+}
     ++	# Check whether we should use 'meld --auto-merge ...'
     ++	if test -z "${meld_has_auto_merge_option:+set}"
     + 	then
     +-		: old ones mention --output and new ones just say OPTION...
     +-		meld_has_output_option=true
     +-	else
     +-		meld_has_output_option=false
     ++		meld_has_auto_merge_option=$(git config --bool mergetool.meld.hasAutoMerge)
     ++		if test "$meld_has_auto_merge_option" = true -o \
     ++						"$meld_has_auto_merge_option" = false
     ++		then
     ++			: use configured value
     ++		else												# treat meld_has_auto_merge_option as "auto"
     ++			if test -z "$meld_help_msg"
     ++			then
     ++					meld_help_msg="$(get_meld_help_msg)"
     ++			fi
     ++
     ++			if echo "$meld_help_msg" | grep -e '--auto-merge' >/dev/null
     ++			then
     ++					meld_has_auto_merge_option=true
     ++			else
     ++				meld_has_auto_merge_option=false
     ++			fi
     ++		fi
     + 	fi
     + }

 mergetools/meld | 73 ++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 57 insertions(+), 16 deletions(-)

index 7a08470f88..1b92771228 100644
@@ -3,34 +3,75 @@ diff_cmd () {
 }
 
 merge_cmd () {
-	if test -z "${meld_has_output_option:+set}"
+	check_meld_for_features
+
+	option_auto_merge=
+	if test "$meld_has_auto_merge_option" = true
 	then
-		check_meld_for_output_version
+		option_auto_merge="--auto-merge"
 	fi
 
 	if test "$meld_has_output_option" = true
 	then
-		"$merge_tool_path" --output="$MERGED" \
+		"$merge_tool_path" $option_auto_merge --output="$MERGED" \
 			"$LOCAL" "$BASE" "$REMOTE"
 	else
-		"$merge_tool_path" "$LOCAL" "$MERGED" "$REMOTE"
+		"$merge_tool_path" $option_auto_merge "$LOCAL" "$MERGED" "$REMOTE"
 	fi
 }
 
-# Check whether we should use 'meld --output <file>'
-check_meld_for_output_version () {
-	meld_path="$(git config mergetool.meld.path)"
-	meld_path="${meld_path:-meld}"
+# Get meld help message
+get_meld_help_msg () {
+	meld_path="$(git config mergetool.meld.path || echo meld)"
+  $meld_path --help 2>&1
+}
 
-	if meld_has_output_option=$(git config --bool mergetool.meld.hasOutput)
+# Check the features and set flags
+check_meld_for_features () {
+	# Check whether we should use 'meld --output <file>'
+	if test -z "${meld_has_output_option:+set}"
 	then
-		: use configured value
-	elif "$meld_path" --help 2>&1 |
-		grep -e '--output=' -e '\[OPTION\.\.\.\]' >/dev/null
+		meld_has_output_option=$(git config --bool mergetool.meld.hasOutput)
+		if test "$meld_has_output_option" = true -o \
+						"$meld_has_output_option" = false
+		then
+			: use configured value
+		else												# treat meld_has_output_option as "auto"
+			if test -z "$meld_help_msg"
+			then
+				meld_help_msg="$(get_meld_help_msg)"
+			fi
+
+			if echo "$meld_help_msg" |
+							grep -e '--output=' -e '\[OPTION\.\.\.\]' >/dev/null
+			then
+				: old ones mention --output and new ones just say OPTION...
+				meld_has_output_option=true
+			else
+				meld_has_output_option=false
+			fi
+		fi
+	fi
+	# Check whether we should use 'meld --auto-merge ...'
+	if test -z "${meld_has_auto_merge_option:+set}"
 	then
-		: old ones mention --output and new ones just say OPTION...
-		meld_has_output_option=true
-	else
-		meld_has_output_option=false
+		meld_has_auto_merge_option=$(git config --bool mergetool.meld.hasAutoMerge)
+		if test "$meld_has_auto_merge_option" = true -o \
+						"$meld_has_auto_merge_option" = false
+		then
+			: use configured value
+		else												# treat meld_has_auto_merge_option as "auto"
+			if test -z "$meld_help_msg"
+			then
+					meld_help_msg="$(get_meld_help_msg)"
+			fi
+
+			if echo "$meld_help_msg" | grep -e '--auto-merge' >/dev/null
+			then
+					meld_has_auto_merge_option=true
+			else
+				meld_has_auto_merge_option=false
+			fi
+		fi
 	fi
 }

base-commit: 07d8ea56f2ecb64b75b92264770c0a664231ce17

gitgitgadget

This part needs to be fixed, aka, use your real name here :).

	case "$meld_help_msg" in
	*"[OPTION"???"]"*)
		meld_has_output_option=true ;;
	*)
		meld_has_output_option=false ;;
	esac

Danh

Please read this line as:
Is this a copy-paste and forget to edit-afterward. Somehow that line was lost.

Sorry for the extra noise

Thanks,
Danh

From: Lin Sun <[email protected]>

Make the mergetool used with "meld" backend behave similarly to how "vimdiff" behavior by telling it to auto-merge parts without conflicts and highlight the parts with conflicts when configuring mergetool.meld.hasAutoMerge with true, or auto for automatically detecting the option.

---
Enable auto-merge for meld to follow the vimdiff beharior

Hi, the mergetool "meld" does NOT merge the no-conflict changes, while the mergetool "vimdiff" will merge the no-conflict changes and highlight the conflict parts. This patch will make the mergetool "meld" similar to "vimdiff", auto-merge the no-conflict changes, highlight conflict parts.

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-781%2Fsunlin7%2Fmaster-v5
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-781/sunlin7/master-v5
Pull-Request: https://github.com/git/git/pull/781

Range-diff vs v4:

1: 93ae3ec011 ! 1: 344817d579 Enable auto-merge for meld to follow the vim-diff beharior

     @@
       ## Metadata ##
     -Author: lin.sun <[email protected]>
     +Author: Lin Sun <[email protected]>
      
       ## Commit message ##
          Enable auto-merge for meld to follow the vim-diff beharior
      
          Make the mergetool used with "meld" backend behave similarly to
     -    how "vimdiff" beheaves by telling it to auto-merge parts without
     -    conflicts and highlight the parts with conflicts.
     +    how "vimdiff" behavior by telling it to auto-merge parts without
     +    conflicts and highlight the parts with conflicts when configuring
     +    `mergetool.meld.hasAutoMerge` with `true`, or `auto` for
     +    automatically detecting the option.
      
     -    Signed-off-by: lin.sun <[email protected]>
     +    Signed-off-by: Lin Sun <[email protected]>
     +
     + ## Documentation/config/mergetool.txt ##
     +@@ Documentation/config/mergetool.txt: mergetool.meld.hasOutput::
     + 	to `true` tells Git to unconditionally use the `--output` option,
     + 	and `false` avoids using `--output`.
     + 
     ++mergetool.meld.hasAutoMerge::
     ++	Older versions of `meld` do not support the `--auto-merge` option.
     ++	Setting `mergetool.meld.hasOutput` to `true` tells Git to
     ++	unconditionally use the `--auto-merge` option, and `false` avoids using
     ++	`--auto-merge`, and `auto` detect whether `meld` supports `--auto-merge`
     ++	by inspecting the output of `meld --help`, otherwise, follow meld's
     ++	default behavior.
     ++
     + mergetool.keepBackup::
     + 	After performing a merge, the original file with conflict markers
     + 	can be saved as a file with a `.orig` extension.  If this variable
      
       ## mergetools/meld ##
      @@ mergetools/meld: diff_cmd () {
     @@ mergetools/meld: diff_cmd () {
      +# Get meld help message
      +get_meld_help_msg () {
      +	meld_path="$(git config mergetool.meld.path || echo meld)"
     -+  $meld_path --help 2>&1
     ++	$meld_path --help 2>&1
      +}
       
      -	if meld_has_output_option=$(git config --bool mergetool.meld.hasOutput)
     @@ mergetools/meld: diff_cmd () {
      -		grep -e '--output=' -e '\[OPTION\.\.\.\]' >/dev/null
      +		meld_has_output_option=$(git config --bool mergetool.meld.hasOutput)
      +		if test "$meld_has_output_option" = true -o \
     -+						"$meld_has_output_option" = false
     ++			"$meld_has_output_option" = false
      +		then
      +			: use configured value
     -+		else												# treat meld_has_output_option as "auto"
     ++		else
     ++			# treat meld_has_output_option as "auto"
      +			if test -z "$meld_help_msg"
      +			then
      +				meld_help_msg="$(get_meld_help_msg)"
      +			fi
      +
     -+			if echo "$meld_help_msg" |
     -+							grep -e '--output=' -e '\[OPTION\.\.\.\]' >/dev/null
     -+			then
     -+				: old ones mention --output and new ones just say OPTION...
     -+				meld_has_output_option=true
     -+			else
     -+				meld_has_output_option=false
     -+			fi
     ++			case "$meld_help_msg" in
     ++				*"--output="* | *"[OPTION"???"]"*)
     ++					# old ones mention --output and new ones just say OPTION...
     ++					meld_has_output_option=true ;;
     ++				*)
     ++					meld_has_output_option=false ;;
     ++			esac
      +		fi
      +	fi
      +	# Check whether we should use 'meld --auto-merge ...'
     @@ mergetools/meld: diff_cmd () {
      -		meld_has_output_option=true
      -	else
      -		meld_has_output_option=false
     -+		meld_has_auto_merge_option=$(git config --bool mergetool.meld.hasAutoMerge)
     -+		if test "$meld_has_auto_merge_option" = true -o \
     -+						"$meld_has_auto_merge_option" = false
     ++		meld_has_auto_merge_option=$(git config mergetool.meld.hasAutoMerge)
     ++		if test "$meld_has_auto_merge_option" = auto
      +		then
     -+			: use configured value
     -+		else												# treat meld_has_auto_merge_option as "auto"
     ++			# testing the "--auto-merge" option only if config is "auto"
      +			if test -z "$meld_help_msg"
      +			then
      +					meld_help_msg="$(get_meld_help_msg)"
      +			fi
      +
     -+			if echo "$meld_help_msg" | grep -e '--auto-merge' >/dev/null
     -+			then
     -+					meld_has_auto_merge_option=true
     -+			else
     -+				meld_has_auto_merge_option=false
     -+			fi
     ++			case "$meld_help_msg" in
     ++				*"--auto-merge"*)
     ++					: old ones mention --output and new ones just say OPTION...
     ++					meld_has_auto_merge_option=true ;;
     ++				*)
     ++					meld_has_auto_merge_option=false ;;
     ++			esac
      +		fi
       	fi
       }

 Documentation/config/mergetool.txt |  8 ++++
 mergetools/meld                    | 72 +++++++++++++++++++++++-------
 2 files changed, 64 insertions(+), 16 deletions(-)

index 09ed31dbfa..9a74bd98dc 100644
@@ -30,6 +30,14 @@ mergetool.meld.hasOutput::
 	to `true` tells Git to unconditionally use the `--output` option,
 	and `false` avoids using `--output`.
 
+mergetool.meld.hasAutoMerge::
+	Older versions of `meld` do not support the `--auto-merge` option.
+	Setting `mergetool.meld.hasOutput` to `true` tells Git to
+	unconditionally use the `--auto-merge` option, and `false` avoids using
+	`--auto-merge`, and `auto` detect whether `meld` supports `--auto-merge`
+	by inspecting the output of `meld --help`, otherwise, follow meld's
+	default behavior.
+
 mergetool.keepBackup::
 	After performing a merge, the original file with conflict markers
 	can be saved as a file with a `.orig` extension.  If this variable

base-commit: 07d8ea56f2ecb64b75b92264770c0a664231ce17

gitgitgadget

Hi Danh,

The [PATH v5] is changed to following the comments from you, Junio, David.
Please review this newer version. Thank you.
The raw files is https://github.com/git/git/blob/344817d57970e3ac0910cdd8ad47bf97334ab2a6/mergetools/meld

Regards
Lin
-----Original Message-----
From: sunlin via GitGitGadget <[email protected]>
Sent: Wednesday, July 1, 2020 15:07
To: [email protected]
Cc: sunlin <[email protected]>; Lin Sun <[email protected]>
Subject: [PATCH v5] Enable auto-merge for meld to follow the vim-diff beharior

From: Lin Sun <[email protected]>

Make the mergetool used with "meld" backend behave similarly to how "vimdiff" behavior by telling it to auto-merge parts without conflicts and highlight the parts with conflicts when configuring mergetool.meld.hasAutoMerge with true, or auto for automatically detecting the option.

---
Enable auto-merge for meld to follow the vimdiff beharior

Hi, the mergetool "meld" does NOT merge the no-conflict changes, while the mergetool "vimdiff" will merge the no-conflict changes and highlight the conflict parts. This patch will make the mergetool "meld" similar to "vimdiff", auto-merge the no-conflict changes, highlight conflict parts.

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-781%2Fsunlin7%2Fmaster-v5
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-781/sunlin7/master-v5
Pull-Request: https://github.com/git/git/pull/781

Range-diff vs v4:

1: 93ae3ec011 ! 1: 344817d579 Enable auto-merge for meld to follow the vim-diff beharior

     @@
       ## Metadata ##
     -Author: lin.sun <[email protected]>
     +Author: Lin Sun <[email protected]>
      
       ## Commit message ##
          Enable auto-merge for meld to follow the vim-diff beharior
      
          Make the mergetool used with "meld" backend behave similarly to
     -    how "vimdiff" beheaves by telling it to auto-merge parts without
     -    conflicts and highlight the parts with conflicts.
     +    how "vimdiff" behavior by telling it to auto-merge parts without
     +    conflicts and highlight the parts with conflicts when configuring
     +    `mergetool.meld.hasAutoMerge` with `true`, or `auto` for
     +    automatically detecting the option.
      
     -    Signed-off-by: lin.sun <[email protected]>
     +    Signed-off-by: Lin Sun <[email protected]>
     +
     + ## Documentation/config/mergetool.txt ##
     +@@ Documentation/config/mergetool.txt: mergetool.meld.hasOutput::
     + 	to `true` tells Git to unconditionally use the `--output` option,
     + 	and `false` avoids using `--output`.
     + 
     ++mergetool.meld.hasAutoMerge::
     ++	Older versions of `meld` do not support the `--auto-merge` option.
     ++	Setting `mergetool.meld.hasOutput` to `true` tells Git to
     ++	unconditionally use the `--auto-merge` option, and `false` avoids using
     ++	`--auto-merge`, and `auto` detect whether `meld` supports `--auto-merge`
     ++	by inspecting the output of `meld --help`, otherwise, follow meld's
     ++	default behavior.
     ++
     + mergetool.keepBackup::
     + 	After performing a merge, the original file with conflict markers
     + 	can be saved as a file with a `.orig` extension.  If this variable
      
       ## mergetools/meld ##
      @@ mergetools/meld: diff_cmd () {
     @@ mergetools/meld: diff_cmd () {
      +# Get meld help message
      +get_meld_help_msg () {
      +	meld_path="$(git config mergetool.meld.path || echo meld)"
     -+  $meld_path --help 2>&1
     ++	$meld_path --help 2>&1
      +}
       
      -	if meld_has_output_option=$(git config --bool mergetool.meld.hasOutput)
     @@ mergetools/meld: diff_cmd () {
      -		grep -e '--output=' -e '\[OPTION\.\.\.\]' >/dev/null
      +		meld_has_output_option=$(git config --bool mergetool.meld.hasOutput)
      +		if test "$meld_has_output_option" = true -o \
     -+						"$meld_has_output_option" = false
     ++			"$meld_has_output_option" = false
      +		then
      +			: use configured value
     -+		else												# treat meld_has_output_option as "auto"
     ++		else
     ++			# treat meld_has_output_option as "auto"
      +			if test -z "$meld_help_msg"
      +			then
      +				meld_help_msg="$(get_meld_help_msg)"
      +			fi
      +
     -+			if echo "$meld_help_msg" |
     -+							grep -e '--output=' -e '\[OPTION\.\.\.\]' >/dev/null
     -+			then
     -+				: old ones mention --output and new ones just say OPTION...
     -+				meld_has_output_option=true
     -+			else
     -+				meld_has_output_option=false
     -+			fi
     ++			case "$meld_help_msg" in
     ++				*"--output="* | *"[OPTION"???"]"*)
     ++					# old ones mention --output and new ones just say OPTION...
     ++					meld_has_output_option=true ;;
     ++				*)
     ++					meld_has_output_option=false ;;
     ++			esac
      +		fi
      +	fi
      +	# Check whether we should use 'meld --auto-merge ...'
     @@ mergetools/meld: diff_cmd () {
      -		meld_has_output_option=true
      -	else
      -		meld_has_output_option=false
     -+		meld_has_auto_merge_option=$(git config --bool mergetool.meld.hasAutoMerge)
     -+		if test "$meld_has_auto_merge_option" = true -o \
     -+						"$meld_has_auto_merge_option" = false
     ++		meld_has_auto_merge_option=$(git config mergetool.meld.hasAutoMerge)
     ++		if test "$meld_has_auto_merge_option" = auto
      +		then
     -+			: use configured value
     -+		else												# treat meld_has_auto_merge_option as "auto"
     ++			# testing the "--auto-merge" option only if config is "auto"
      +			if test -z "$meld_help_msg"
      +			then
      +					meld_help_msg="$(get_meld_help_msg)"
      +			fi
      +
     -+			if echo "$meld_help_msg" | grep -e '--auto-merge' >/dev/null
     -+			then
     -+					meld_has_auto_merge_option=true
     -+			else
     -+				meld_has_auto_merge_option=false
     -+			fi
     ++			case "$meld_help_msg" in
     ++				*"--auto-merge"*)
     ++					: old ones mention --output and new ones just say OPTION...
     ++					meld_has_auto_merge_option=true ;;
     ++				*)
     ++					meld_has_auto_merge_option=false ;;
     ++			esac
      +		fi
       	fi
       }

 Documentation/config/mergetool.txt |  8 ++++
 mergetools/meld                    | 72 +++++++++++++++++++++++-------
 2 files changed, 64 insertions(+), 16 deletions(-)

index 09ed31dbfa..9a74bd98dc 100644
@@ -30,6 +30,14 @@ mergetool.meld.hasOutput::
 	to `true` tells Git to unconditionally use the `--output` option,
 	and `false` avoids using `--output`.
 
+mergetool.meld.hasAutoMerge::
+	Older versions of `meld` do not support the `--auto-merge` option.
+	Setting `mergetool.meld.hasOutput` to `true` tells Git to
+	unconditionally use the `--auto-merge` option, and `false` avoids using
+	`--auto-merge`, and `auto` detect whether `meld` supports `--auto-merge`
+	by inspecting the output of `meld --help`, otherwise, follow meld's
+	default behavior.
+
 mergetool.keepBackup::
 	After performing a merge, the original file with conflict markers
 	can be saved as a file with a `.orig` extension.  If this variable diff --git a/mergetools/meld b/mergetools/meld index 7a08470f88..9ee835b1e5 100644

base-commit: 07d8ea56f2ecb64b75b92264770c0a664231ce17 --
gitgitgadget

Please word-wrap commit messages to 72 chars or less.

	if test "$meld_has_output_option" = true ||
		test "$meld_has_output_option" = false
	then
		...
	fi

	case "$meld_help_msg" in
	*--output=*|*"[OPTION"???"]"*)
		# old ones mention --output and new ones just say OPTION...
		meld_has_output_option=true
		;;
	*)
		meld_has_output_option=false
		;;
	esac

	meld_help_msg=$(get_meld_help_msg)

David

Hi Danh,

Thank you for your comments, and changes apply to the last patch with your suggestions. Please refer the attachment for [PATH v6]. Thank you.

Regards
Lin

-----Original Message-----
From: Đoàn Trần Công Danh <[email protected]>
Sent: Wednesday, July 1, 2020 22:18
To: sunlin via GitGitGadget <[email protected]>
Cc: [email protected]; sunlin <[email protected]>; Lin Sun <[email protected]>
Subject: Re: [PATCH v5] Enable auto-merge for meld to follow the vim-diff beharior

	init_meld_help_msg () {
		if test -z "$meld_help_msg"
		then
			meld_path="$(git config mergetool.meld.path || echo meld)"
			meld_help_msg=$($meld_path --help 2>&1)
		fi
	}

	case "$meld_has_auto_merge_option" in
	[Tt]rue|[Yy]es|[Oo]n)
		meld_has_auto_merge_option=true ;;
	auto)
		: this shenanigan ;;
	esac

--
Danh

From 33968fb9e52a6ead7b9fc64943d4c82c3f893865 Mon Sep 17 00:00:00 2001
From: Lin Sun <[email protected]>
Date: Thu, 7 May 2020 07:31:14 +0800
Subject: [PATCH] Enable auto-merge for meld to follow the vim-diff beharior
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Make the mergetool used with "meld" backend behave similarly to how "vimdiff" behavior by telling it to auto-merge parts without conflicts and highlight the parts with conflicts when configuring mergetool.meld.hasAutoMerge with true, or auto for automatically detecting the option.

---
 Documentation/config/mergetool.txt |  8 ++++
 mergetools/meld                    | 80 ++++++++++++++++++++++++++++++--------
 2 files changed, 72 insertions(+), 16 deletions(-)

index 09ed31d..d2af88c 100644
@@ -30,6 +30,14 @@ mergetool.meld.hasOutput::
 	to `true` tells Git to unconditionally use the `--output` option,
 	and `false` avoids using `--output`.
 
+mergetool.meld.hasAutoMerge::
+	Older versions of `meld` do not support the `--auto-merge` option.
+	Setting `mergetool.meld.hasAutoMerge` to `true` tells Git to
+	unconditionally use the `--auto-merge` option, and `false` avoids using
+	`--auto-merge`, and `auto` detect whether `meld` supports `--auto-merge`
+	by inspecting the output of `meld --help`, otherwise, follow meld's
+	default behavior.
+
 mergetool.keepBackup::
 	After performing a merge, the original file with conflict markers
 	can be saved as a file with a `.orig` extension.  If this variable

2.2.0

Hi Danh,

I'll push the patch to GitGitGadget so that it's will sending from the system mail. Sorry for this noise.

Regards
Lin

-----Original Message-----
From: [email protected] <[email protected]>
Sent: Wednesday, July 1, 2020 23:32
To: 'Đoàn Trần Công Danh' <[email protected]>; 'sunlin via GitGitGadget' <[email protected]>
Cc: [email protected]; 'Lin Sun' <[email protected]>
Subject: RE: [PATCH v5] Enable auto-merge for meld to follow the vim-diff beharior

Hi Danh,

Thank you for your comments, and changes apply to the last patch with your suggestions. Please refer the attachment for [PATH v6]. Thank you.

Regards
Lin

-----Original Message-----
From: Đoàn Trần Công Danh <[email protected]>
Sent: Wednesday, July 1, 2020 22:18
To: sunlin via GitGitGadget <[email protected]>
Cc: [email protected]; sunlin <[email protected]>; Lin Sun <[email protected]>
Subject: Re: [PATCH v5] Enable auto-merge for meld to follow the vim-diff beharior

	init_meld_help_msg () {
		if test -z "$meld_help_msg"
		then
			meld_path="$(git config mergetool.meld.path || echo meld)"
			meld_help_msg=$($meld_path --help 2>&1)
		fi
	}

	case "$meld_has_auto_merge_option" in
	[Tt]rue|[Yy]es|[Oo]n)
		meld_has_auto_merge_option=true ;;
	auto)
		: this shenanigan ;;
	esac

--
Danh

Hi Lin,

While you're doing it,
do you mind changing hasAutoMerge to useAutoMerge? I think that name is better :)

c.f: https://lore.kernel.org/git/[email protected]/

Thanks,

Danh

I do not think "has" is a good choice for this one, even though hasOutput may very well be a good one for "output". As the paragraph describes (below), this lets the user "avoid" using "--auto-merge", even if the version of "meld" the user has does have the automerge capability.

So perhaps say "mergetool.meld.useAutoMerge"; that will let the users express exactly their wish---don't use it (false), do forcibly try to use it (true), or use it when able (auto).

Hi Danh,

Okay, no problem, it will be useAutoMerge.

Regards
Lin

From: Lin Sun <[email protected]>

Make the mergetool used with "meld" backend behave similarly to how "vimdiff" behavior by telling it to auto-merge parts without conflicts and highlight the parts with conflicts when configuring mergetool.meld.useAutoMerge with true, or auto for automatically detecting the option.

---
Enable auto-merge for meld to follow the vimdiff beharior

Hi, the mergetool "meld" does NOT merge the no-conflict changes, while the mergetool "vimdiff" will merge the no-conflict changes and highlight the conflict parts. This patch will make the mergetool "meld" similar to "vimdiff", auto-merge the no-conflict changes, highlight conflict parts.

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-781%2Fsunlin7%2Fmaster-v6
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-781/sunlin7/master-v6
Pull-Request: https://github.com/git/git/pull/781

Range-diff vs v5:

1: 344817d579 ! 1: 63ee3406d2 Enable auto-merge for meld to follow the vim-diff beharior

     @@ Metadata
      Author: Lin Sun <[email protected]>
      
       ## Commit message ##
     -    Enable auto-merge for meld to follow the vim-diff beharior
     +    Support auto-merge for meld to follow the vim-diff behavior
      
     -    Make the mergetool used with "meld" backend behave similarly to
     -    how "vimdiff" behavior by telling it to auto-merge parts without
     -    conflicts and highlight the parts with conflicts when configuring
     -    `mergetool.meld.hasAutoMerge` with `true`, or `auto` for
     -    automatically detecting the option.
     +    Make the mergetool used with "meld" backend behave similarly to how
     +    "vimdiff" behavior by telling it to auto-merge parts without conflicts
     +    and highlight the parts with conflicts when configuring
     +    `mergetool.meld.useAutoMerge` with `true`, or `auto` for automatically
     +    detecting the option.
      
     +    Helped-by: Đoàn Trần Công Danh <[email protected]>
     +    Helped-by: Junio C Hamano <[email protected]>
     +    Helped-by: David Aguilar <[email protected]>
          Signed-off-by: Lin Sun <[email protected]>
      
       ## Documentation/config/mergetool.txt ##
     @@ Documentation/config/mergetool.txt: mergetool.meld.hasOutput::
       	to `true` tells Git to unconditionally use the `--output` option,
       	and `false` avoids using `--output`.
       
     -+mergetool.meld.hasAutoMerge::
     ++mergetool.meld.useAutoMerge::
      +	Older versions of `meld` do not support the `--auto-merge` option.
     -+	Setting `mergetool.meld.hasOutput` to `true` tells Git to
     -+	unconditionally use the `--auto-merge` option, and `false` avoids using
     -+	`--auto-merge`, and `auto` detect whether `meld` supports `--auto-merge`
     -+	by inspecting the output of `meld --help`, otherwise, follow meld's
     -+	default behavior.
     ++	Setting `mergetool.meld.useAutoMerge` to `true` tells Git to
     ++	unconditionally use the `--auto-merge` option with `meld`.  Setting
     ++	this value to `auto` makes git detect whether `--auto-merge` is
     ++	supported and will only use `--auto-merge` when available.  A value
     ++	of `false` avoids using `--auto-merge` altogether, and is the default
     ++	value.
      +
       mergetool.keepBackup::
       	After performing a merge, the original file with conflict markers
     @@ mergetools/meld: diff_cmd () {
      +	check_meld_for_features
      +
      +	option_auto_merge=
     -+	if test "$meld_has_auto_merge_option" = true
     ++	if test "$meld_use_auto_merge_option" = true
       	then
      -		check_meld_for_output_version
      +		option_auto_merge="--auto-merge"
     @@ mergetools/meld: diff_cmd () {
      -	meld_path="$(git config mergetool.meld.path)"
      -	meld_path="${meld_path:-meld}"
      +# Get meld help message
     -+get_meld_help_msg () {
     -+	meld_path="$(git config mergetool.meld.path || echo meld)"
     -+	$meld_path --help 2>&1
     ++init_meld_help_msg () {
     ++	if test -z "${meld_help_msg:+set}"
     ++	then
     ++		meld_path="$(git config mergetool.meld.path || echo meld)"
     ++		meld_help_msg=$($meld_path --help 2>&1)
     ++	fi
      +}
       
      -	if meld_has_output_option=$(git config --bool mergetool.meld.hasOutput)
     @@ mergetools/meld: diff_cmd () {
      -	elif "$meld_path" --help 2>&1 |
      -		grep -e '--output=' -e '\[OPTION\.\.\.\]' >/dev/null
      +		meld_has_output_option=$(git config --bool mergetool.meld.hasOutput)
     -+		if test "$meld_has_output_option" = true -o \
     -+			"$meld_has_output_option" = false
     -+		then
     ++		case "$meld_has_output_option" in
     ++		true|false)
      +			: use configured value
     -+		else
     -+			# treat meld_has_output_option as "auto"
     -+			if test -z "$meld_help_msg"
     -+			then
     -+				meld_help_msg="$(get_meld_help_msg)"
     -+			fi
     ++			;;
     ++		*)
     ++			: treat meld_has_output_option as "auto"
     ++			init_meld_help_msg
      +
      +			case "$meld_help_msg" in
     -+				*"--output="* | *"[OPTION"???"]"*)
     -+					# old ones mention --output and new ones just say OPTION...
     -+					meld_has_output_option=true ;;
     -+				*)
     -+					meld_has_output_option=false ;;
     ++			*"--output="* | *'[OPTION...]'*)
     ++				# All version that has [OPTION...] supports --output
     ++				meld_has_output_option=true
     ++				;;
     ++			*)
     ++				meld_has_output_option=false
     ++				;;
      +			esac
     -+		fi
     ++			;;
     ++		esac
      +	fi
      +	# Check whether we should use 'meld --auto-merge ...'
     -+	if test -z "${meld_has_auto_merge_option:+set}"
     ++	if test -z "${meld_use_auto_merge_option:+set}"
       	then
      -		: old ones mention --output and new ones just say OPTION...
      -		meld_has_output_option=true
      -	else
      -		meld_has_output_option=false
     -+		meld_has_auto_merge_option=$(git config mergetool.meld.hasAutoMerge)
     -+		if test "$meld_has_auto_merge_option" = auto
     -+		then
     ++		meld_use_auto_merge_option=$(git config mergetool.meld.useAutoMerge)
     ++		case "$meld_use_auto_merge_option" in
     ++		[Tt]rue|[Yy]es|[Oo]n|1)
     ++			meld_use_auto_merge_option=true
     ++			;;
     ++		auto)
      +			# testing the "--auto-merge" option only if config is "auto"
     -+			if test -z "$meld_help_msg"
     -+			then
     -+					meld_help_msg="$(get_meld_help_msg)"
     -+			fi
     ++			init_meld_help_msg
      +
      +			case "$meld_help_msg" in
     -+				*"--auto-merge"*)
     -+					: old ones mention --output and new ones just say OPTION...
     -+					meld_has_auto_merge_option=true ;;
     -+				*)
     -+					meld_has_auto_merge_option=false ;;
     ++			*"--auto-merge"*)
     ++				meld_use_auto_merge_option=true
     ++				;;
     ++			*)
     ++				meld_use_auto_merge_option=false
     ++				;;
      +			esac
     -+		fi
     ++			;;
     ++		*)
     ++			meld_use_auto_merge_option=false
     ++			;;
     ++		esac
       	fi
       }

 Documentation/config/mergetool.txt |  9 ++++
 mergetools/meld                    | 80 ++++++++++++++++++++++++------
 2 files changed, 73 insertions(+), 16 deletions(-)

index 09ed31dbfa..625ad34230 100644
@@ -30,6 +30,15 @@ mergetool.meld.hasOutput::
 	to `true` tells Git to unconditionally use the `--output` option,
 	and `false` avoids using `--output`.
 
+mergetool.meld.useAutoMerge::
+	Older versions of `meld` do not support the `--auto-merge` option.
+	Setting `mergetool.meld.useAutoMerge` to `true` tells Git to
+	unconditionally use the `--auto-merge` option with `meld`.  Setting
+	this value to `auto` makes git detect whether `--auto-merge` is
+	supported and will only use `--auto-merge` when available.  A value
+	of `false` avoids using `--auto-merge` altogether, and is the default
+	value.
+
 mergetool.keepBackup::
 	After performing a merge, the original file with conflict markers
 	can be saved as a file with a `.orig` extension.  If this variable

base-commit: 07d8ea56f2ecb64b75b92264770c0a664231ce17

gitgitgadget

Hi,

The [PATCH v6] changes to follow comments from Danh, Junio, David. Please review again. Thank you all.

https://lore.kernel.org/git/[email protected]/

Regards
Lin

Thanks.

    if test -z "${var:+set}"

    if o=$(git config --bool 2>/dev/null mergetool.meld.useautomerge)
    then
    	meld_use_auto_merge_option=$o
    elif test auto = "$(git config mergetool.meld.useautomerge)"
    then
	... auto detect ...
    else
	meld_use_auto_merge_option=false
    fi

Hi Junio,

Thank you for your comments, and the changes are made to follow your suggestion. In the [PATCH v7], the ":+set" is removed, and the "${var,,*}" is used to convert configuration to lower-case, it won't call git config twice for getting useAutoMerge.

Please review again, thank you.
https://lore.kernel.org/git/[email protected]

Regards
Lin

Something like this should work if we don't write anything to stderr, except the complain from git-config:

	if o=$(git config --bool mergetool.meld.useautomerge 2>&1)
	then
		meld_use_auto_merge_option=$o
	else
		case "$o" in
		*"'auto'"*) ... auto detect ... ;;
		esac
	fi

This code block is likely broken if git-config is chatty (trace). I don't know if we have a reliable ways to tell Git to not chatty, though.

Danh

I did say "Maybe somebody else has a clever idea to reduce the two calls into one without breaking correctness" but the stress is on the "without breaking correctness" part, not on "clever" part. Two "git config" call may be more expensive than one call, but at least the resulting code is readable.

If we really wanted to, I think the way to go would actually be to teach "git config" new options that allows us scripters to express what we can already say internally like "maybe bool", "bool or int", etc. IOW, "git config --bool-or-string" that does something like

int git_config_bool_or_str(const char **dest,

			   const char *name, const char *value);
{
	int v = git_parse_maybe_bool_text(value);
	if (0 <= v)
        	*dest = v ? "true" : "false";
	else                
        	*dest = value;
	return 0;
}

may help normalizing various ways to spell boolean plus non-boolean strings into canonical form, so that you can say

	if o=$(git config --bool-or-string mergetool.meld.useautomerge)"
	then
		case "$o" in
		true | false)
		        meld_use_auto_merge_option=$o # as specified
			;;
		auto)
			... auto detect ...
			;;
		esac
	else
		meld_use_auto_merge_option=false
	fi

But I think two calls to config is good enough and it certainly is not worth making the script ugly with hackeries and/or manually enumerating all the possible shapes of trues and falses.

Thanks.

From: Lin Sun <[email protected]>

Make the mergetool used with "meld" backend behave similarly to "vimdiff" by telling it to auto-merge non-conflicting parts and highlight the conflicting parts when mergetool.meld.useAutoMerge is configured with true, or auto for detecting the --auto-merge option automatically.

---
Enable auto-merge for meld to follow the vimdiff beharior

Hi, the mergetool "meld" does NOT merge the no-conflict changes, while the mergetool "vimdiff" will merge the no-conflict changes and highlight the conflict parts. This patch will make the mergetool "meld" similar to "vimdiff", auto-merge the no-conflict changes, highlight conflict parts.

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-781%2Fsunlin7%2Fmaster-v7
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-781/sunlin7/master-v7
Pull-Request: https://github.com/git/git/pull/781

Range-diff vs v6:

1: 63ee3406d2 ! 1: ec2b49b9b8 Support auto-merge for meld to follow the vim-diff behavior
@@ Metadata
## Commit message ##
Support auto-merge for meld to follow the vim-diff behavior

- Make the mergetool used with "meld" backend behave similarly to how
- "vimdiff" behavior by telling it to auto-merge parts without conflicts
- and highlight the parts with conflicts when configuring
- mergetool.meld.useAutoMerge with true, or auto for automatically
- detecting the option.
+ Make the mergetool used with "meld" backend behave similarly to
+ "vimdiff" by telling it to auto-merge non-conflicting parts and
+ highlight the conflicting parts when mergetool.meld.useAutoMerge is
+ configured with true, or auto for detecting the --auto-merge
+ option automatically.

@@ Documentation/config/mergetool.txt: mergetool.meld.hasOutput::
and false avoids using --output.

+mergetool.meld.useAutoMerge::
-+ Older versions of meld do not support the --auto-merge option.
-+ Setting mergetool.meld.useAutoMerge to true tells Git to
-+ unconditionally use the --auto-merge option with meld. Setting
-+ this value to auto makes git detect whether --auto-merge is
-+ supported and will only use --auto-merge when available. A value
-+ of false avoids using --auto-merge altogether, and is the default
-+ value.
++ When the --auto-merge is given, meld will merges all non-conflicting
++ part automatically, highlight the conflicting part and waiting for user
++ decision. Setting mergetool.meld.useAutoMerge to true tells Git to
++ unconditionally use the --auto-merge option with meld. Setting this
++ value to auto makes git detect whether --auto-merge is supported and
++ will only use --auto-merge when available. A value of false avoids
++ using --auto-merge altogether, and is the default value.
+
mergetool.keepBackup::
After performing a merge, the original file with conflict markers
@@ mergetools/meld: diff_cmd () {
- meld_path="${meld_path:-meld}"
+# Get meld help message
+init_meld_help_msg () {
-+ if test -z "${meld_help_msg:+set}"
++ if test -z "${meld_help_msg}"
+ then
+ meld_path="$(git config mergetool.meld.path || echo meld)"
+ meld_help_msg=$($meld_path --help 2>&1)
@@ mergetools/meld: diff_cmd () {
+# Check the features and set flags +check_meld_for_features () {
+ # Check whether we should use 'meld --output <file>'
-+ if test -z "${meld_has_output_option:+set}"
++ if test -z "${meld_has_output_option}"
then
- : use configured value
- elif "$meld_path" --help 2>&1 |
@@ mergetools/meld: diff_cmd () {
+ : use configured value
+ ;;
+ *)
-+ : treat meld_has_output_option as "auto"
++ : empty or invalid configured value, detecting "--output" automatically
+ init_meld_help_msg
+
+ case "$meld_help_msg" in
@@ mergetools/meld: diff_cmd () {
+ esac
+ fi
+ # Check whether we should use 'meld --auto-merge ...'
-+ if test -z "${meld_use_auto_merge_option:+set}"
++ if test -z "${meld_use_auto_merge_option}"
then
- : old ones mention --output and new ones just say OPTION...
- meld_has_output_option=true
- else
- meld_has_output_option=false
+ meld_use_auto_merge_option=$(git config mergetool.meld.useAutoMerge)
-+ case "$meld_use_auto_merge_option" in
-+ [Tt]rue|[Yy]es|[Oo]n|1)
++ case "${meld_use_auto_merge_option,,*}" in
++ true|yes|on|1)
+ meld_use_auto_merge_option=true
+ ;;
+ auto)

 Documentation/config/mergetool.txt |  9 ++++
 mergetools/meld                    | 80 ++++++++++++++++++++++++------
 2 files changed, 73 insertions(+), 16 deletions(-)

index 09ed31dbfa..b7657734a0 100644
@@ -30,6 +30,15 @@ mergetool.meld.hasOutput::
 	to `true` tells Git to unconditionally use the `--output` option,
 	and `false` avoids using `--output`.
 
+mergetool.meld.useAutoMerge::
+	When the `--auto-merge` is given, meld will merges all non-conflicting
+	part automatically, highlight the conflicting part and waiting for user
+	decision.  Setting `mergetool.meld.useAutoMerge` to `true` tells Git to
+	unconditionally use the `--auto-merge` option with `meld`.  Setting this
+	value to `auto` makes git detect whether `--auto-merge` is supported and
+	will only use `--auto-merge` when available.  A value of `false` avoids
+	using `--auto-merge` altogether, and is the default value.
+
 mergetool.keepBackup::
 	After performing a merge, the original file with conflict markers
 	can be saved as a file with a `.orig` extension.  If this variable

base-commit: 07d8ea56f2ecb64b75b92264770c0a664231ce17

gitgitgadget

Grammo: "will merges"???

Now we do not use the :+ magic, there is no reason to use extra {brace} around the variable name. Just sticking to the normal "$meld_help_msg" would help the readers to hint that there is no strange thing going on.

DON'T.

The ${parameter,,pattern} expansion is one of the non-portable bash-isms we do not use in our codebase. Use of it won't fix the correctness problem coming from not using --bool anyway, because ...

... any numeric value that is not 0 is taken as true. Writing 1 here does not help.

Hi Junio, Doah,

To follow your comments, the new [PATCH v8] is uploaded, try to reduce calling git config --bool. Please review again. Thank you.
https://lore.kernel.org/git/[email protected]/

B.R.
Lin

Hi Junio, Doah,

Please review the [PATCH v9] instead, it will calling the git config --bool ... until last moment.
https://lore.kernel.org/git/[email protected]/

B.R.
Lin

From: Lin Sun <[email protected]>

Make the mergetool used with "meld" backend behave similarly to "vimdiff" by telling it to auto-merge non-conflicting parts and highlight the conflicting parts when mergetool.meld.useAutoMerge is configured with true, or auto for detecting the --auto-merge option automatically.

---
Enable auto-merge for meld to follow the vimdiff beharior

Hi, the mergetool "meld" does NOT merge the no-conflict changes, while the mergetool "vimdiff" will merge the no-conflict changes and highlight the conflict parts. This patch will make the mergetool "meld" similar to "vimdiff", auto-merge the no-conflict changes, highlight conflict parts.

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-781%2Fsunlin7%2Fmaster-v8
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-781/sunlin7/master-v8
Pull-Request: https://github.com/git/git/pull/781

Range-diff vs v7:

1: ec2b49b9b8 ! 1: f28a32c66e Support auto-merge for meld to follow the vim-diff behavior

     @@ Metadata
       ## Commit message ##
          Support auto-merge for meld to follow the vim-diff behavior
      
     -    Make the mergetool used with "meld" backend behave similarly to
     -    "vimdiff" by telling it to auto-merge non-conflicting parts and
     -    highlight the conflicting parts when `mergetool.meld.useAutoMerge` is
     -    configured with `true`, or `auto` for detecting the `--auto-merge`
     -    option automatically.
     +    Make the mergetool used with "meld" backend behave similarly to "vimdiff" by
     +    telling it to auto-merge non-conflicting parts and highlight the conflicting
     +    parts when `mergetool.meld.useAutoMerge` is configured with `true`, or `auto`
     +    for detecting the `--auto-merge` option automatically.
      
          Helped-by: Đoàn Trần Công Danh <[email protected]>
          Helped-by: Junio C Hamano <[email protected]>
     @@ Documentation/config/mergetool.txt: mergetool.meld.hasOutput::
       	and `false` avoids using `--output`.
       
      +mergetool.meld.useAutoMerge::
     -+	When the `--auto-merge` is given, meld will merges all non-conflicting
     -+	part automatically, highlight the conflicting part and waiting for user
     -+	decision.  Setting `mergetool.meld.useAutoMerge` to `true` tells Git to
     -+	unconditionally use the `--auto-merge` option with `meld`.  Setting this
     -+	value to `auto` makes git detect whether `--auto-merge` is supported and
     -+	will only use `--auto-merge` when available.  A value of `false` avoids
     -+	using `--auto-merge` altogether, and is the default value.
     ++	When the `--auto-merge` is given, meld will merge all non-conflicting
     ++	parts automatically, highlight the conflicting parts and waiting for
     ++	user decision.  Setting `mergetool.meld.useAutoMerge` to `true` tells
     ++	Git to unconditionally use the `--auto-merge` option with `meld`.
     ++	Setting this value to `auto` makes git detect whether `--auto-merge`
     ++	is supported and will only use `--auto-merge` when available.  A
     ++	value of `false` avoids using `--auto-merge` altogether, and is the
     ++	default value.
      +
       mergetool.keepBackup::
       	After performing a merge, the original file with conflict markers
     @@ mergetools/meld: diff_cmd () {
      -	meld_path="${meld_path:-meld}"
      +# Get meld help message
      +init_meld_help_msg () {
     -+	if test -z "${meld_help_msg}"
     ++	if test -z "$meld_help_msg"
      +	then
      +		meld_path="$(git config mergetool.meld.path || echo meld)"
      +		meld_help_msg=$($meld_path --help 2>&1)
     @@ mergetools/meld: diff_cmd () {
      +# Check the features and set flags
      +check_meld_for_features () {
      +	# Check whether we should use 'meld --output <file>'
     -+	if test -z "${meld_has_output_option}"
     ++	if test -z "$meld_has_output_option"
       	then
      -		: use configured value
      -	elif "$meld_path" --help 2>&1 |
     @@ mergetools/meld: diff_cmd () {
      +		esac
      +	fi
      +	# Check whether we should use 'meld --auto-merge ...'
     -+	if test -z "${meld_use_auto_merge_option}"
     ++	if test -z "$meld_use_auto_merge_option"
       	then
      -		: old ones mention --output and new ones just say OPTION...
      -		meld_has_output_option=true
      -	else
      -		meld_has_output_option=false
      +		meld_use_auto_merge_option=$(git config mergetool.meld.useAutoMerge)
     -+		case "${meld_use_auto_merge_option,,*}" in
     -+		true|yes|on|1)
     -+			meld_use_auto_merge_option=true
     -+			;;
     -+		auto)
     -+			# testing the "--auto-merge" option only if config is "auto"
     -+			init_meld_help_msg
     ++		if test -z "$meld_use_auto_merge_option"
     ++		then
     ++			meld_use_auto_merge_option=false
     ++		else
     ++			bool_value=$(git config --bool mergetool.meld.useAutoMerge 2>/dev/null)
     ++			if test -n "$bool_value"
     ++			then
     ++				meld_use_auto_merge_option="$bool_value"
     ++			elif test "$meld_use_auto_merge_option" = "auto" \
     ++				|| test "$meld_use_auto_merge_option" = "Auto"
     ++			then
     ++				# testing the "--auto-merge" option only if config is "[Aa]uto"
     ++				init_meld_help_msg
      +
     -+			case "$meld_help_msg" in
     -+			*"--auto-merge"*)
     -+				meld_use_auto_merge_option=true
     -+				;;
     -+			*)
     ++				case "$meld_help_msg" in
     ++				*"--auto-merge"*)
     ++					meld_use_auto_merge_option=true
     ++					;;
     ++				*)
     ++					meld_use_auto_merge_option=false
     ++					;;
     ++				esac
     ++			else
      +				meld_use_auto_merge_option=false
     -+				;;
     -+			esac
     -+			;;
     -+		*)
     -+			meld_use_auto_merge_option=false
     -+			;;
     -+		esac
     ++			fi
     ++		fi
       	fi
       }

 Documentation/config/mergetool.txt | 10 ++++
 mergetools/meld                    | 85 ++++++++++++++++++++++++------
 2 files changed, 79 insertions(+), 16 deletions(-)

index 09ed31dbfa..031c78aa95 100644
@@ -30,6 +30,16 @@ mergetool.meld.hasOutput::
 	to `true` tells Git to unconditionally use the `--output` option,
 	and `false` avoids using `--output`.
 
+mergetool.meld.useAutoMerge::
+	When the `--auto-merge` is given, meld will merge all non-conflicting
+	parts automatically, highlight the conflicting parts and waiting for
+	user decision.  Setting `mergetool.meld.useAutoMerge` to `true` tells
+	Git to unconditionally use the `--auto-merge` option with `meld`.
+	Setting this value to `auto` makes git detect whether `--auto-merge`
+	is supported and will only use `--auto-merge` when available.  A
+	value of `false` avoids using `--auto-merge` altogether, and is the
+	default value.
+
 mergetool.keepBackup::
 	After performing a merge, the original file with conflict markers
 	can be saved as a file with a `.orig` extension.  If this variable

base-commit: 07d8ea56f2ecb64b75b92264770c0a664231ce17

gitgitgadget

From: Lin Sun <[email protected]>

Make the mergetool used with "meld" backend behave similarly to "vimdiff" by telling it to auto-merge non-conflicting parts and highlight the conflicting parts when mergetool.meld.useAutoMerge is configured with true, or auto for detecting the --auto-merge option automatically.

---
Enable auto-merge for meld to follow the vimdiff beharior

Hi, the mergetool "meld" does NOT merge the no-conflict changes, while the mergetool "vimdiff" will merge the no-conflict changes and highlight the conflict parts. This patch will make the mergetool "meld" similar to "vimdiff", auto-merge the no-conflict changes, highlight conflict parts.

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-781%2Fsunlin7%2Fmaster-v9
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-781/sunlin7/master-v9
Pull-Request: https://github.com/git/git/pull/781

Range-diff vs v8:

1: f28a32c66e ! 1: 95586fb2c2 Support auto-merge for meld to follow the vim-diff behavior

     @@ mergetools/meld: diff_cmd () {
      -	else
      -		meld_has_output_option=false
      +		meld_use_auto_merge_option=$(git config mergetool.meld.useAutoMerge)
     -+		if test -z "$meld_use_auto_merge_option"
     -+		then
     ++		case "$meld_use_auto_merge_option" in
     ++		"")
      +			meld_use_auto_merge_option=false
     -+		else
     ++			;;
     ++		[Aa]uto)
     ++			# testing the "--auto-merge" option only if config is "[Aa]uto"
     ++			init_meld_help_msg
     ++
     ++			case "$meld_help_msg" in
     ++			*"--auto-merge"*)
     ++				meld_use_auto_merge_option=true
     ++				;;
     ++			*)
     ++				meld_use_auto_merge_option=false
     ++				;;
     ++			esac
     ++			;;
     ++		*)
      +			bool_value=$(git config --bool mergetool.meld.useAutoMerge 2>/dev/null)
      +			if test -n "$bool_value"
      +			then
      +				meld_use_auto_merge_option="$bool_value"
     -+			elif test "$meld_use_auto_merge_option" = "auto" \
     -+				|| test "$meld_use_auto_merge_option" = "Auto"
     -+			then
     -+				# testing the "--auto-merge" option only if config is "[Aa]uto"
     -+				init_meld_help_msg
     -+
     -+				case "$meld_help_msg" in
     -+				*"--auto-merge"*)
     -+					meld_use_auto_merge_option=true
     -+					;;
     -+				*)
     -+					meld_use_auto_merge_option=false
     -+					;;
     -+				esac
      +			else
      +				meld_use_auto_merge_option=false
      +			fi
     -+		fi
     ++			;;
     ++		esac
       	fi
       }

 Documentation/config/mergetool.txt | 10 ++++
 mergetools/meld                    | 86 ++++++++++++++++++++++++------
 2 files changed, 80 insertions(+), 16 deletions(-)

index 09ed31dbfa..031c78aa95 100644
@@ -30,6 +30,16 @@ mergetool.meld.hasOutput::
 	to `true` tells Git to unconditionally use the `--output` option,
 	and `false` avoids using `--output`.
 
+mergetool.meld.useAutoMerge::
+	When the `--auto-merge` is given, meld will merge all non-conflicting
+	parts automatically, highlight the conflicting parts and waiting for
+	user decision.  Setting `mergetool.meld.useAutoMerge` to `true` tells
+	Git to unconditionally use the `--auto-merge` option with `meld`.
+	Setting this value to `auto` makes git detect whether `--auto-merge`
+	is supported and will only use `--auto-merge` when available.  A
+	value of `false` avoids using `--auto-merge` altogether, and is the
+	default value.
+
 mergetool.keepBackup::
 	After performing a merge, the original file with conflict markers
 	can be saved as a file with a `.orig` extension.  If this variable

base-commit: 07d8ea56f2ecb64b75b92264770c0a664231ce17

gitgitgadget

This reads well.

    $ o=$(git config --bool rerere.enabled); echo $o
    true
    $ o=$(git config rerere.enabled); echo $o

    $    

	varname=mergetool.meld.useAutoMerge
	if meld_use_auto_merge_option=$(git config --bool "$varname" 2>/dev/null)
	then
        	: happy
	else
                # not a boolean.  Is it 'auto'?
		val=$(git config "$varname")
                case "$val" in
                auto)
                        ;;
                *)
                        die "unrecognized value '$val' for $varname"
                        ;;;
                esac
                ... here we auto detect ...
	fi

Hi Junio,

Thank you for your comments, and I made the changes in [PATH v10].
For git config --bool ..., with a = appending to the rerere.enabled will get reverse result, here are the commands.

$ echo [rerere] enabled >> .git/config
$ git config --bool rerere.enabled
true
$ echo [rerere] enabled = >> .git/config
$ git config --bool rerere.enabled
false

So in [PATH v10], it still try get the string value first, then detecting the ""(empty)/true/false/auto. That will cover most cases with one git config... calling for useAutoMerge is not configured or is configured properly. Otherwise, it will try call git config --bool ... for checking more boolean configuration values.

Please review the [PATH v10], thank you.
https://lore.kernel.org/git/[email protected]/

Regards
Lin

You cannot interpret an empty output from "git config section.variable"; it could be "[section] variable" (which is true), or it could be a sign that there is no "[section] variable = value" in the configuration (which you treat as false).

Catching common spellings of 'true' and 'false' in the output of the string version of "git config", while checking for 'auto' at the same time, may not be too bad as an optimization to save an extra call to "git config --bool 2>/dev/null" (and ignoring errors), so I am OK with that as long as you leave the empty output alone.

Hi Junio,

Yes, I notice that both "[section] variable " and "[section] variable = " output empty string but have reverse Boolean value.

With preview point, git config --bool ... would better than "not be too bad" : )

With the return code and return string from git config --bool ..., follow pseudo-code maybe good for current situation.
if meld_use_auto_merge_option = git config --bool ... then
# success, maybe "(empty)"/true/false
if test -z "$ meld_use_auto_merge_option"
then
meld_use_auto_merge_option=false
fi
else
# failed, the option is not empty or Boolean
if test "auto" = git config
then
# detect the "--auto-merge" option
else
meld_use_auto_merge_option=false
fi
fi

Changes will upload with the [PATCH v12].
I'll update to you when the patch is ready.

Regards
Lin

The inner test does not make any sense to me; I doubt that you can get an empty output from a "git config --bool" that succeeds.

     $ cat >config <<\EOF
     [x] a
         b=true
         c=1
         d=false
         e=no
	 f=bogus
     EOF
     $ for i in a b c d e f
       do
         if v=$(git config --file=config --bool x.$i 2>/dev/null)
         then
           echo "succeeds (x.$i) => '$v'"
         else
           echo "fails (x.$i) => '$v'"
         fi
       done

You should see

succeeds (x.a) => 'true'
succeeds (x.b) => 'true'
succeeds (x.c) => 'true'
succeeds (x.d) => 'false'
succeeds (x.e) => 'false'
fails (x.f) => ''

if you run the above. The most interesting is how all boolean values are normalized to true and false regardless of how they are originally spelled.

I think review by Đoàn pointed out that we would want to warn/fail loudly in this "else" case, as it is likely a misspelt configuration value?

To recap, I think something along the following lines would be the most readable and acceptably efficient with a short-cut for the common cases.

    var=mergetool.meld.whatever
    val=$(git config $var)
    case "$val" in
    true | false)
	# we can take a short-cut without asking config --bool
        ... use $val ...
	;;
    auto)
	... auto detect ...
	;;
    *)
	if val=$(git config --bool $var 2>/dev/null)
	then
		# succeeded, so val must be a normalized boolean
		... use $val ...
	else
		die cannot parse $var
	fi
    easc

Thanks.

From: Lin Sun <[email protected]>

Make the mergetool used with "meld" backend behave similarly to "vimdiff" by telling it to auto-merge non-conflicting parts and highlight the conflicting parts when mergetool.meld.useAutoMerge is configured with true, or auto for detecting the --auto-merge option automatically.

---
Enable auto-merge for meld to follow the vimdiff beharior

Hi, the mergetool "meld" does NOT merge the no-conflict changes, while the mergetool "vimdiff" will merge the no-conflict changes and highlight the conflict parts. This patch will make the mergetool "meld" similar to "vimdiff", auto-merge the no-conflict changes, highlight conflict parts.

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-781%2Fsunlin7%2Fmaster-v10
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-781/sunlin7/master-v10
Pull-Request: https://github.com/git/git/pull/781

Range-diff vs v9:

1: 95586fb2c2 ! 1: a4f1b8c2fa Support auto-merge for meld to follow the vim-diff behavior

     @@ Commit message
          for detecting the `--auto-merge` option automatically.
      
          Helped-by: Đoàn Trần Công Danh <[email protected]>
     -    Helped-by: Junio C Hamano <[email protected]>
          Helped-by: David Aguilar <[email protected]>
          Signed-off-by: Lin Sun <[email protected]>
     +    Signed-off-by: Junio C Hamano <[email protected]>
      
       ## Documentation/config/mergetool.txt ##
      @@ Documentation/config/mergetool.txt: mergetool.meld.hasOutput::
     @@ Documentation/config/mergetool.txt: mergetool.meld.hasOutput::
       
      +mergetool.meld.useAutoMerge::
      +	When the `--auto-merge` is given, meld will merge all non-conflicting
     -+	parts automatically, highlight the conflicting parts and waiting for
     ++	parts automatically, highlight the conflicting parts and wait for
      +	user decision.  Setting `mergetool.meld.useAutoMerge` to `true` tells
      +	Git to unconditionally use the `--auto-merge` option with `meld`.
      +	Setting this value to `auto` makes git detect whether `--auto-merge`
     @@ mergetools/meld: diff_cmd () {
      +		"")
      +			meld_use_auto_merge_option=false
      +			;;
     -+		[Aa]uto)
     -+			# testing the "--auto-merge" option only if config is "[Aa]uto"
     ++		[Tt]ure|TRUE)
     ++			meld_use_auto_merge_option=true
     ++			;;
     ++		[Ff]alse|FALSE)
     ++			meld_use_auto_merge_option=false
     ++			;;
     ++		[Aa]uto|AUTO)
     ++			# testing the "--auto-merge" option only if config is "auto"
      +			init_meld_help_msg
      +
      +			case "$meld_help_msg" in
     @@ mergetools/meld: diff_cmd () {
      +			esac
      +			;;
      +		*)
     ++			# try detect boolean for 'on'||'yes'||numberic value
      +			bool_value=$(git config --bool mergetool.meld.useAutoMerge 2>/dev/null)
      +			if test -n "$bool_value"
      +			then

 Documentation/config/mergetool.txt | 10 ++++
 mergetools/meld                    | 93 +++++++++++++++++++++++++-----
 2 files changed, 87 insertions(+), 16 deletions(-)

index 09ed31dbfa..16a27443a3 100644
@@ -30,6 +30,16 @@ mergetool.meld.hasOutput::
 	to `true` tells Git to unconditionally use the `--output` option,
 	and `false` avoids using `--output`.
 
+mergetool.meld.useAutoMerge::
+	When the `--auto-merge` is given, meld will merge all non-conflicting
+	parts automatically, highlight the conflicting parts and wait for
+	user decision.  Setting `mergetool.meld.useAutoMerge` to `true` tells
+	Git to unconditionally use the `--auto-merge` option with `meld`.
+	Setting this value to `auto` makes git detect whether `--auto-merge`
+	is supported and will only use `--auto-merge` when available.  A
+	value of `false` avoids using `--auto-merge` altogether, and is the
+	default value.
+
 mergetool.keepBackup::
 	After performing a merge, the original file with conflict markers
 	can be saved as a file with a `.orig` extension.  If this variable

base-commit: 07d8ea56f2ecb64b75b92264770c0a664231ce17

gitgitgadget

Hi Junio,

It seems our mails crossed. I'll read your comments in this mail and reply you later.

Lin

-----Original Message-----
From: Junio C Hamano <[email protected]>
Sent: Tuesday, July 7, 2020 14:26
To: sunlin via GitGitGadget <[email protected]>
Cc: [email protected]; sunlin <[email protected]>; Lin Sun <[email protected]>
Subject: Re: [PATCH v10] Support auto-merge for meld to follow the vim-diff behavior

Hi Junio,

I got your points now, I will upload another patch soon. Thank you.

Regards
Lin

-----Original Message-----
From: [email protected] <[email protected]>
Sent: Tuesday, July 7, 2020 14:39
To: 'Junio C Hamano' <[email protected]>; 'sunlin via GitGitGadget' <[email protected]>
Cc: [email protected]; 'sunlin' <[email protected]>
Subject: RE: [PATCH v10] Support auto-merge for meld to follow the vim-diff behavior

Hi Junio,

It seems our mails crossed. I'll read your comments in this mail and reply you later.

Lin

-----Original Message-----
From: Junio C Hamano <[email protected]>
Sent: Tuesday, July 7, 2020 14:26
To: sunlin via GitGitGadget <[email protected]>
Cc: [email protected]; sunlin <[email protected]>; Lin Sun <[email protected]>
Subject: Re: [PATCH v10] Support auto-merge for meld to follow the vim-diff behavior

From: Lin Sun <[email protected]>

Make the mergetool used with "meld" backend behave similarly to "vimdiff" by telling it to auto-merge non-conflicting parts and highlight the conflicting parts when mergetool.meld.useAutoMerge is configured with true, or auto for detecting the --auto-merge option automatically.

---
Enable auto-merge for meld to follow the vimdiff beharior

Hi, the mergetool "meld" does NOT merge the no-conflict changes, while the mergetool "vimdiff" will merge the no-conflict changes and highlight the conflict parts. This patch will make the mergetool "meld" similar to "vimdiff", auto-merge the no-conflict changes, highlight conflict parts.

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-781%2Fsunlin7%2Fmaster-v11
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-781/sunlin7/master-v11
Pull-Request: https://github.com/git/git/pull/781

Range-diff vs v10:

1: a4f1b8c2fa ! 1: 8015c4c98e Support auto-merge for meld to follow the vim-diff behavior

     @@ mergetools/meld: diff_cmd () {
      -		meld_has_output_option=true
      -	else
      -		meld_has_output_option=false
     -+		meld_use_auto_merge_option=$(git config mergetool.meld.useAutoMerge)
     -+		case "$meld_use_auto_merge_option" in
     -+		"")
     -+			meld_use_auto_merge_option=false
     -+			;;
     -+		[Tt]ure|TRUE)
     -+			meld_use_auto_merge_option=true
     -+			;;
     -+		[Ff]alse|FALSE)
     -+			meld_use_auto_merge_option=false
     -+			;;
     -+		[Aa]uto|AUTO)
     -+			# testing the "--auto-merge" option only if config is "auto"
     -+			init_meld_help_msg
     -+
     -+			case "$meld_help_msg" in
     -+			*"--auto-merge"*)
     -+				meld_use_auto_merge_option=true
     -+				;;
     -+			*)
     -+				meld_use_auto_merge_option=false
     -+				;;
     -+			esac
     -+			;;
     -+		*)
     -+			# try detect boolean for 'on'||'yes'||numberic value
     -+			bool_value=$(git config --bool mergetool.meld.useAutoMerge 2>/dev/null)
     -+			if test -n "$bool_value"
     ++		if meld_use_auto_merge_option=$( \
     ++			git config --bool mergetool.meld.useAutoMerge 2>/dev/null)
     ++		then
     ++			: use configured value
     ++		else
     ++			meld_use_auto_merge_option=$(git config mergetool.meld.useAutoMerge)
     ++			if test "$meld_use_auto_merge_option" = "auto"
      +			then
     -+				meld_use_auto_merge_option="$bool_value"
     ++				# testing the "--auto-merge" option only if config is "auto"
     ++				init_meld_help_msg
     ++
     ++				case "$meld_help_msg" in
     ++				*"--auto-merge"* | *'[OPTION...]'*)
     ++					meld_use_auto_merge_option=true
     ++					;;
     ++				*)
     ++					meld_use_auto_merge_option=false
     ++					;;
     ++				esac
      +			else
      +				meld_use_auto_merge_option=false
      +			fi
     -+			;;
     -+		esac
     ++		fi
       	fi
       }

 Documentation/config/mergetool.txt | 10 ++++
 mergetools/meld                    | 81 ++++++++++++++++++++++++------
 2 files changed, 75 insertions(+), 16 deletions(-)

index 09ed31dbfa..16a27443a3 100644
@@ -30,6 +30,16 @@ mergetool.meld.hasOutput::
 	to `true` tells Git to unconditionally use the `--output` option,
 	and `false` avoids using `--output`.
 
+mergetool.meld.useAutoMerge::
+	When the `--auto-merge` is given, meld will merge all non-conflicting
+	parts automatically, highlight the conflicting parts and wait for
+	user decision.  Setting `mergetool.meld.useAutoMerge` to `true` tells
+	Git to unconditionally use the `--auto-merge` option with `meld`.
+	Setting this value to `auto` makes git detect whether `--auto-merge`
+	is supported and will only use `--auto-merge` when available.  A
+	value of `false` avoids using `--auto-merge` altogether, and is the
+	default value.
+
 mergetool.keepBackup::
 	After performing a merge, the original file with conflict markers
 	can be saved as a file with a `.orig` extension.  If this variable

base-commit: 07d8ea56f2ecb64b75b92264770c0a664231ce17

gitgitgadget

Hi Doah,

Yes, you're totally right, I'll fix the $meld_path and more changes will upload with the [PATCH v12]. I'll update to you when the patch is ready.

Regards
Lin

From: Lin Sun <[email protected]>

Make the mergetool used with "meld" backend behave similarly to "vimdiff" by telling it to auto-merge non-conflicting parts and highlight the conflicting parts when mergetool.meld.useAutoMerge is configured with true, or auto for detecting the --auto-merge option automatically.

---
Enable auto-merge for meld to follow the vimdiff beharior

Hi, the mergetool "meld" does NOT merge the no-conflict changes, while the mergetool "vimdiff" will merge the no-conflict changes and highlight the conflict parts. This patch will make the mergetool "meld" similar to "vimdiff", auto-merge the no-conflict changes, highlight conflict parts.

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-781%2Fsunlin7%2Fmaster-v12
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-781/sunlin7/master-v12
Pull-Request: https://github.com/git/git/pull/781

Range-diff vs v11:

1: 8015c4c98e ! 1: b130cf38b5 Support auto-merge for meld to follow the vim-diff behavior

     @@ mergetools/meld: diff_cmd () {
      +	if test -z "$meld_help_msg"
      +	then
      +		meld_path="$(git config mergetool.meld.path || echo meld)"
     -+		meld_help_msg=$($meld_path --help 2>&1)
     ++		meld_help_msg=$("$meld_path" --help 2>&1)
      +	fi
      +}
       
     @@ mergetools/meld: diff_cmd () {
      +			init_meld_help_msg
      +
      +			case "$meld_help_msg" in
     -+			*"--output="* | *'[OPTION...]'*)
     ++			*"--output="*|*'[OPTION...]'*)
      +				# All version that has [OPTION...] supports --output
      +				meld_has_output_option=true
      +				;;
     @@ mergetools/meld: diff_cmd () {
      -		meld_has_output_option=true
      -	else
      -		meld_has_output_option=false
     -+		if meld_use_auto_merge_option=$( \
     -+			git config --bool mergetool.meld.useAutoMerge 2>/dev/null)
     -+		then
     -+			: use configured value
     -+		else
     -+			meld_use_auto_merge_option=$(git config mergetool.meld.useAutoMerge)
     -+			if test "$meld_use_auto_merge_option" = "auto"
     -+			then
     -+				# testing the "--auto-merge" option only if config is "auto"
     -+				init_meld_help_msg
     ++		meld_use_auto_merge_option=$(git config mergetool.meld.useAutoMerge)
     ++		case "$meld_use_auto_merge_option" in
     ++		true|false)
     ++			: use well formatted boolean value
     ++			;;
     ++		auto)
     ++			# testing the "--auto-merge" option only if config is "auto"
     ++			init_meld_help_msg
      +
     -+				case "$meld_help_msg" in
     -+				*"--auto-merge"* | *'[OPTION...]'*)
     -+					meld_use_auto_merge_option=true
     -+					;;
     -+				*)
     -+					meld_use_auto_merge_option=false
     -+					;;
     -+				esac
     ++			case "$meld_help_msg" in
     ++			*"--auto-merge"*|*'[OPTION...]')
     ++				meld_use_auto_merge_option=true
     ++				;;
     ++			*)
     ++				meld_use_auto_merge_option=false
     ++				;;
     ++			esac
     ++			;;
     ++		*)
     ++			if meld_use_auto_merge_option=$(\
     ++				 git config --bool mergetool.meld.useAutoMerge)
     ++			then
     ++				: use normalized boolean value
      +			else
      +				meld_use_auto_merge_option=false
      +			fi
     -+		fi
     ++			;;
     ++		esac
       	fi
       }

 Documentation/config/mergetool.txt | 10 ++++
 mergetools/meld                    | 86 ++++++++++++++++++++++++------
 2 files changed, 80 insertions(+), 16 deletions(-)

index 09ed31dbfa..16a27443a3 100644
@@ -30,6 +30,16 @@ mergetool.meld.hasOutput::
 	to `true` tells Git to unconditionally use the `--output` option,
 	and `false` avoids using `--output`.
 
+mergetool.meld.useAutoMerge::
+	When the `--auto-merge` is given, meld will merge all non-conflicting
+	parts automatically, highlight the conflicting parts and wait for
+	user decision.  Setting `mergetool.meld.useAutoMerge` to `true` tells
+	Git to unconditionally use the `--auto-merge` option with `meld`.
+	Setting this value to `auto` makes git detect whether `--auto-merge`
+	is supported and will only use `--auto-merge` when available.  A
+	value of `false` avoids using `--auto-merge` altogether, and is the
+	default value.
+
 mergetool.keepBackup::
 	After performing a merge, the original file with conflict markers
 	can be saved as a file with a `.orig` extension.  If this variable

base-commit: 07d8ea56f2ecb64b75b92264770c0a664231ce17

gitgitgadget

Hi Junio, Doah,

The [PATCH v12] Is uploaded, in which,
1. "$meld_path" is quoted.
2. the logical for deal true/false/auto is flow Junio's comment
3. error message will emit for invalid configuration value

$ git config mergetool.meld.useAutoMerge invalid_boolean_value
$ git mergetool --tool=meld
...
fatal: bad numeric config value 'hello' for 'mergetool.meld.useautomerge' in .git/config: invalid unit

Please review again, thank you.
https://lore.kernel.org/git/[email protected]/

Regards
Lin

Hi Danh,

Thank you for your comment, it's actually my failed that loss the "*" after *"[OPTIONS...]". I'll add back the missing '*' in next uploading.

Regards
Lin

From: Lin Sun <[email protected]>

Make the mergetool used with "meld" backend behave similarly to "vimdiff" by telling it to auto-merge non-conflicting parts and highlight the conflicting parts when mergetool.meld.useAutoMerge is configured with true, or auto for detecting the --auto-merge option automatically.

---
Enable auto-merge for meld to follow the vimdiff beharior

Hi, the mergetool "meld" does NOT merge the no-conflict changes, while the mergetool "vimdiff" will merge the no-conflict changes and highlight the conflict parts. This patch will make the mergetool "meld" similar to "vimdiff", auto-merge the no-conflict changes, highlight conflict parts.

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-781%2Fsunlin7%2Fmaster-v13
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-781/sunlin7/master-v13
Pull-Request: https://github.com/git/git/pull/781

Range-diff vs v12:

1: b130cf38b5 ! 1: b949e5721a Support auto-merge for meld to follow the vim-diff behavior

     @@ mergetools/meld: diff_cmd () {
      +			init_meld_help_msg
      +
      +			case "$meld_help_msg" in
     -+			*"--auto-merge"*|*'[OPTION...]')
     ++			*"--auto-merge"*|*'[OPTION...]'*)
      +				meld_use_auto_merge_option=true
      +				;;
      +			*)

 Documentation/config/mergetool.txt | 10 ++++
 mergetools/meld                    | 86 ++++++++++++++++++++++++------
 2 files changed, 80 insertions(+), 16 deletions(-)

index 09ed31dbfa..16a27443a3 100644
@@ -30,6 +30,16 @@ mergetool.meld.hasOutput::
 	to `true` tells Git to unconditionally use the `--output` option,
 	and `false` avoids using `--output`.
 
+mergetool.meld.useAutoMerge::
+	When the `--auto-merge` is given, meld will merge all non-conflicting
+	parts automatically, highlight the conflicting parts and wait for
+	user decision.  Setting `mergetool.meld.useAutoMerge` to `true` tells
+	Git to unconditionally use the `--auto-merge` option with `meld`.
+	Setting this value to `auto` makes git detect whether `--auto-merge`
+	is supported and will only use `--auto-merge` when available.  A
+	value of `false` avoids using `--auto-merge` altogether, and is the
+	default value.
+
 mergetool.keepBackup::
 	After performing a merge, the original file with conflict markers
 	can be saved as a file with a `.orig` extension.  If this variable

base-commit: 07d8ea56f2ecb64b75b92264770c0a664231ce17

gitgitgadget

Hi Danh,

The [PATCH v13] add the missing "*" back at the back of *'[OPTION...]'.

     -+			*"--auto-merge"*|*'[OPTION...]')
     ++			*"--auto-merge"*|*'[OPTION...]'*)

https://lore.kernel.org/git/[email protected]
Thanks

Regards
Lin

I'd retitle to match the recommended structure, e.g.

Subject: [PATCH] mergetool: update meld backend to allow using '--auto-merge'

while queuing.

Thanks. I might have more comments later.

Hi Junio,

I'll add SP on both side of '|', and remove the backslash, thank you.

This line assign value with git config --bool... is over 80 characters, so there is a break.

The command line git config --bool ... without "2>&/dev/null" will print error message, just passthrough to user.

$ git config mergetool.meld.useAutoMerge hello 
$ git mergetool --tool=meld 
fatal: bad numeric config value 'hello' for 'mergetool.meld.useautomerge' in .git/config: invalid unit

I'll upload the changes soon.

Regards
Lin

Yes, but you do not exit(1) here, so the user will keep going without having a chance to stop, think and correct the misspelt value in the configuration file, no?

Hmph, I've been forgetting an important case you are handling well, which is that the user does not have the variable defined anywhere in the configuration. "git config --bool var.ia.ble" fails silently in such a case, and you do want to declare that the user does not want to use the "--auto-merge" in that case, which is what this silent else clause does very well.

So, let's leave this part as-is.

Thanks, I'll push out a new iteration of today's integration before going to bed.

Hi Junio,

I had add a new c function git_config_bool_or_str() to support get the configured value for true/false/auto with git. It will make the mergetool/meld only calling git config once for getting the useAutoMerge.

Please review the [PATH v16], thanks.
https://lore.kernel.org/git/[email protected]

Regards
Lin

Hi Junio,

I had rollback the changes, which is submit as [PATCH v17], it's same as [PATCH v14].

You can just ignore it. Thanks

https://lore.kernel.org/git/[email protected]
https://lore.kernel.org/git/[email protected]

Regards
Lin

From: Lin Sun <[email protected]>

Make the mergetool used with "meld" backend behave similarly to "vimdiff" by telling it to auto-merge non-conflicting parts and highlight the conflicting parts when mergetool.meld.useAutoMerge is configured with true, or auto for detecting the --auto-merge option automatically.

---
Enable auto-merge for meld to follow the vimdiff beharior

Hi, the mergetool "meld" does NOT merge the no-conflict changes, while the mergetool "vimdiff" will merge the no-conflict changes and highlight the conflict parts. This patch will make the mergetool "meld" similar to "vimdiff", auto-merge the no-conflict changes, highlight conflict parts.

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-781%2Fsunlin7%2Fmaster-v14
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-781/sunlin7/master-v14
Pull-Request: https://github.com/git/git/pull/781

Range-diff vs v13:

1: b949e5721a ! 1: ce4e4cbfc0 Support auto-merge for meld to follow the vim-diff behavior

     @@ mergetools/meld: diff_cmd () {
      +			esac
      +			;;
      +		*)
     -+			if meld_use_auto_merge_option=$(\
     ++			# try other boolean value with git
     ++			if meld_use_auto_merge_option=$(
      +				 git config --bool mergetool.meld.useAutoMerge)
      +			then
      +				: use normalized boolean value

 Documentation/config/mergetool.txt | 10 ++++
 mergetools/meld                    | 87 ++++++++++++++++++++++++------
 2 files changed, 81 insertions(+), 16 deletions(-)

index 09ed31dbfa..16a27443a3 100644
@@ -30,6 +30,16 @@ mergetool.meld.hasOutput::
 	to `true` tells Git to unconditionally use the `--output` option,
 	and `false` avoids using `--output`.
 
+mergetool.meld.useAutoMerge::
+	When the `--auto-merge` is given, meld will merge all non-conflicting
+	parts automatically, highlight the conflicting parts and wait for
+	user decision.  Setting `mergetool.meld.useAutoMerge` to `true` tells
+	Git to unconditionally use the `--auto-merge` option with `meld`.
+	Setting this value to `auto` makes git detect whether `--auto-merge`
+	is supported and will only use `--auto-merge` when available.  A
+	value of `false` avoids using `--auto-merge` altogether, and is the
+	default value.
+
 mergetool.keepBackup::
 	After performing a merge, the original file with conflict markers
 	can be saved as a file with a `.orig` extension.  If this variable

base-commit: 07d8ea56f2ecb64b75b92264770c0a664231ce17

gitgitgadget

From: Lin Sun <[email protected]>

Make the mergetool used with "meld" backend behave similarly to "vimdiff" by telling it to auto-merge non-conflicting parts and highlight the conflicting parts when mergetool.meld.useAutoMerge is configured with true, or auto for detecting the --auto-merge option automatically.

---
Enable auto-merge for meld to follow the vimdiff beharior

Hi, the mergetool "meld" does NOT merge the no-conflict changes, while the mergetool "vimdiff" will merge the no-conflict changes and highlight the conflict parts. This patch will make the mergetool "meld" similar to "vimdiff", auto-merge the no-conflict changes, highlight conflict parts.

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-781%2Fsunlin7%2Fmaster-v15
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-781/sunlin7/master-v15
Pull-Request: https://github.com/git/git/pull/781

Range-diff vs v14:

1: ce4e4cbfc0 ! 1: 02d849784f Support auto-merge for meld to follow the vim-diff behavior

     @@ Documentation/config/mergetool.txt: mergetool.meld.hasOutput::
       	After performing a merge, the original file with conflict markers
       	can be saved as a file with a `.orig` extension.  If this variable
      
     + ## builtin/config.c ##
     +@@ builtin/config.c: static int show_scope;
     + #define TYPE_PATH		4
     + #define TYPE_EXPIRY_DATE	5
     + #define TYPE_COLOR		6
     ++#define TYPE_BOOL_OR_STR        7
     + 
     + #define OPT_CALLBACK_VALUE(s, l, v, h, i) \
     + 	{ OPTION_CALLBACK, (s), (l), (v), NULL, (h), PARSE_OPT_NOARG | \
     +@@ builtin/config.c: static int option_parse_type(const struct option *opt, const char *arg,
     + 			new_type = TYPE_INT;
     + 		else if (!strcmp(arg, "bool-or-int"))
     + 			new_type = TYPE_BOOL_OR_INT;
     ++		else if (!strcmp(arg, "bool-or-str"))
     ++			new_type = TYPE_BOOL_OR_STR;
     + 		else if (!strcmp(arg, "path"))
     + 			new_type = TYPE_PATH;
     + 		else if (!strcmp(arg, "expiry-date"))
     +@@ builtin/config.c: static struct option builtin_config_options[] = {
     + 	OPT_CALLBACK_VALUE(0, "bool", &type, N_("value is \"true\" or \"false\""), TYPE_BOOL),
     + 	OPT_CALLBACK_VALUE(0, "int", &type, N_("value is decimal number"), TYPE_INT),
     + 	OPT_CALLBACK_VALUE(0, "bool-or-int", &type, N_("value is --bool or --int"), TYPE_BOOL_OR_INT),
     ++	OPT_CALLBACK_VALUE(0, "bool-or-str", &type, N_("value is --bool or string"), TYPE_BOOL_OR_STR),
     + 	OPT_CALLBACK_VALUE(0, "path", &type, N_("value is a path (file or directory name)"), TYPE_PATH),
     + 	OPT_CALLBACK_VALUE(0, "expiry-date", &type, N_("value is an expiry date"), TYPE_EXPIRY_DATE),
     + 	OPT_GROUP(N_("Other")),
     +@@ builtin/config.c: static int format_config(struct strbuf *buf, const char *key_, const char *value
     + 				strbuf_addstr(buf, v ? "true" : "false");
     + 			else
     + 				strbuf_addf(buf, "%d", v);
     ++		} else if (type == TYPE_BOOL_OR_STR) {
     ++			int is_bool, v;
     ++			v = git_config_bool_or_str(NULL, key_, value_, &is_bool);
     ++			if (is_bool)
     ++				strbuf_addstr(buf, v ? "true" : "false");
     ++			else
     ++				strbuf_addstr(buf, value_);
     + 		} else if (type == TYPE_PATH) {
     + 			const char *v;
     + 			if (git_config_pathname(&v, key_, value_) < 0)
     +@@ builtin/config.c: static char *normalize_value(const char *key, const char *value)
     + 		else
     + 			return xstrdup(v ? "true" : "false");
     + 	}
     ++	if (type == TYPE_BOOL_OR_STR) {
     ++		int is_bool, v;
     ++		v = git_config_bool_or_str(NULL, key, value, &is_bool);
     ++		if (!is_bool)
     ++			return xstrdup(value);
     ++		else
     ++			return xstrdup(v ? "true" : "false");
     ++	}
     + 	if (type == TYPE_COLOR) {
     + 		char v[COLOR_MAXLEN];
     + 		if (git_config_color(v, key, value))
     +
     + ## config.c ##
     +@@ config.c: int git_config_bool_or_int(const char *name, const char *value, int *is_bool)
     + 	return git_config_int(name, value);
     + }
     + 
     ++int git_config_bool_or_str(const char **dest, const char *name, const char *value, int *is_bool)
     ++{
     ++	int v = git_parse_maybe_bool_text(value);
     ++	if (0 <= v) {
     ++		*is_bool = 1;
     ++		return v;
     ++	}
     ++	*is_bool = 0;
     ++	if (dest != NULL)
     ++	  return git_config_string(dest, name, value);
     ++	else
     ++	  return 0;
     ++}
     ++
     + int git_config_bool(const char *name, const char *value)
     + {
     + 	int discard;
     +
     + ## config.h ##
     +@@ config.h: ssize_t git_config_ssize_t(const char *, const char *);
     +  */
     + int git_config_bool_or_int(const char *, const char *, int *);
     + 
     ++/**
     ++ * Same as `git_config_bool`, except that `is_bool` flag is unset, then if
     ++ * `dest` parameter is non-NULL, it allocates and copies the value string
     ++ * into the `dest`, if `dest` is NULL and `is_bool` flag is unset it return 0.
     ++ */
     ++int git_config_bool_or_str(const char **, const char *, const char *, int *);
     ++
     + /**
     +  * Parse a string into a boolean value, respecting keywords like "true" and
     +  * "false". Integer values are converted into true/false values (when they
     +
       ## mergetools/meld ##
      @@ mergetools/meld: diff_cmd () {
       }
     @@ mergetools/meld: diff_cmd () {
      -		meld_has_output_option=true
      -	else
      -		meld_has_output_option=false
     -+		meld_use_auto_merge_option=$(git config mergetool.meld.useAutoMerge)
     ++		meld_use_auto_merge_option=$(
     ++			git --bool-or-str config mergetool.meld.useAutoMerge)
      +		case "$meld_use_auto_merge_option" in
      +		true|false)
      +			: use well formatted boolean value
     @@ mergetools/meld: diff_cmd () {
      +			esac
      +			;;
      +		*)
     -+			# try other boolean value with git
     -+			if meld_use_auto_merge_option=$(
     -+				 git config --bool mergetool.meld.useAutoMerge)
     -+			then
     -+				: use normalized boolean value
     -+			else
     -+				meld_use_auto_merge_option=false
     -+			fi
     ++			meld_use_auto_merge_option=false
      +			;;
      +		esac
       	fi

 Documentation/config/mergetool.txt | 10 ++++
 builtin/config.c                   | 19 +++++++
 config.c                           | 14 ++++++
 config.h                           |  7 +++
 mergetools/meld                    | 81 ++++++++++++++++++++++++------
 5 files changed, 115 insertions(+), 16 deletions(-)

index 09ed31dbfa..16a27443a3 100644
@@ -30,6 +30,16 @@ mergetool.meld.hasOutput::
 	to `true` tells Git to unconditionally use the `--output` option,
 	and `false` avoids using `--output`.
 
+mergetool.meld.useAutoMerge::
+	When the `--auto-merge` is given, meld will merge all non-conflicting
+	parts automatically, highlight the conflicting parts and wait for
+	user decision.  Setting `mergetool.meld.useAutoMerge` to `true` tells
+	Git to unconditionally use the `--auto-merge` option with `meld`.
+	Setting this value to `auto` makes git detect whether `--auto-merge`
+	is supported and will only use `--auto-merge` when available.  A
+	value of `false` avoids using `--auto-merge` altogether, and is the
+	default value.
+
 mergetool.keepBackup::
 	After performing a merge, the original file with conflict markers
 	can be saved as a file with a `.orig` extension.  If this variable

index ee4aef6a35..6f2ddadc80 100644
@@ -65,6 +65,7 @@ static int show_scope;
 #define TYPE_PATH		4
 #define TYPE_EXPIRY_DATE	5
 #define TYPE_COLOR		6
+#define TYPE_BOOL_OR_STR        7
 
 #define OPT_CALLBACK_VALUE(s, l, v, h, i) \
 	{ OPTION_CALLBACK, (s), (l), (v), NULL, (h), PARSE_OPT_NOARG | \

@@ -94,6 +95,8 @@ static int option_parse_type(const struct option *opt, const char *arg,
 			new_type = TYPE_INT;
 		else if (!strcmp(arg, "bool-or-int"))
 			new_type = TYPE_BOOL_OR_INT;
+		else if (!strcmp(arg, "bool-or-str"))
+			new_type = TYPE_BOOL_OR_STR;
 		else if (!strcmp(arg, "path"))
 			new_type = TYPE_PATH;
 		else if (!strcmp(arg, "expiry-date"))

@@ -149,6 +152,7 @@ static struct option builtin_config_options[] = {
 	OPT_CALLBACK_VALUE(0, "bool", &type, N_("value is \"true\" or \"false\""), TYPE_BOOL),
 	OPT_CALLBACK_VALUE(0, "int", &type, N_("value is decimal number"), TYPE_INT),
 	OPT_CALLBACK_VALUE(0, "bool-or-int", &type, N_("value is --bool or --int"), TYPE_BOOL_OR_INT),
+	OPT_CALLBACK_VALUE(0, "bool-or-str", &type, N_("value is --bool or string"), TYPE_BOOL_OR_STR),
 	OPT_CALLBACK_VALUE(0, "path", &type, N_("value is a path (file or directory name)"), TYPE_PATH),
 	OPT_CALLBACK_VALUE(0, "expiry-date", &type, N_("value is an expiry date"), TYPE_EXPIRY_DATE),
 	OPT_GROUP(N_("Other")),

@@ -250,6 +254,13 @@ static int format_config(struct strbuf *buf, const char *key_, const char *value
 				strbuf_addstr(buf, v ? "true" : "false");
 			else
 				strbuf_addf(buf, "%d", v);
+		} else if (type == TYPE_BOOL_OR_STR) {
+			int is_bool, v;
+			v = git_config_bool_or_str(NULL, key_, value_, &is_bool);
+			if (is_bool)
+				strbuf_addstr(buf, v ? "true" : "false");
+			else
+				strbuf_addstr(buf, value_);
 		} else if (type == TYPE_PATH) {
 			const char *v;
 			if (git_config_pathname(&v, key_, value_) < 0)

@@ -411,6 +422,14 @@ static char *normalize_value(const char *key, const char *value)
 		else
 			return xstrdup(v ? "true" : "false");
 	}
+	if (type == TYPE_BOOL_OR_STR) {
+		int is_bool, v;
+		v = git_config_bool_or_str(NULL, key, value, &is_bool);
+		if (!is_bool)
+			return xstrdup(value);
+		else
+			return xstrdup(v ? "true" : "false");
+	}
 	if (type == TYPE_COLOR) {
 		char v[COLOR_MAXLEN];
 		if (git_config_color(v, key, value))

index 8db9c77098..4c6c06d10b 100644
@@ -1100,6 +1100,20 @@ int git_config_bool_or_int(const char *name, const char *value, int *is_bool)
 	return git_config_int(name, value);
 }
 
+int git_config_bool_or_str(const char **dest, const char *name, const char *value, int *is_bool)
+{
+	int v = git_parse_maybe_bool_text(value);
+	if (0 <= v) {
+		*is_bool = 1;
+		return v;
+	}
+	*is_bool = 0;
+	if (dest != NULL)
+	  return git_config_string(dest, name, value);
+	else
+	  return 0;
+}
+
 int git_config_bool(const char *name, const char *value)
 {
 	int discard;

index 060874488f..175b88d9c5 100644
@@ -217,6 +217,13 @@ ssize_t git_config_ssize_t(const char *, const char *);
  */
 int git_config_bool_or_int(const char *, const char *, int *);
 
+/**
+ * Same as `git_config_bool`, except that `is_bool` flag is unset, then if
+ * `dest` parameter is non-NULL, it allocates and copies the value string
+ * into the `dest`, if `dest` is NULL and `is_bool` flag is unset it return 0.
+ */
+int git_config_bool_or_str(const char **, const char *, const char *, int *);
+
 /**
  * Parse a string into a boolean value, respecting keywords like "true" and
  * "false". Integer values are converted into true/false values (when they

base-commit: 07d8ea56f2ecb64b75b92264770c0a664231ce17

gitgitgadget

From: Lin Sun <[email protected]>

Make the mergetool used with "meld" backend behave similarly to "vimdiff" by telling it to auto-merge non-conflicting parts and highlight the conflicting parts when mergetool.meld.useAutoMerge is configured with true, or auto for detecting the --auto-merge option automatically.

---
Enable auto-merge for meld to follow the vimdiff beharior

Hi, the mergetool "meld" does NOT merge the no-conflict changes, while the mergetool "vimdiff" will merge the no-conflict changes and highlight the conflict parts. This patch will make the mergetool "meld" similar to "vimdiff", auto-merge the no-conflict changes, highlight conflict parts.

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-781%2Fsunlin7%2Fmaster-v16
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-781/sunlin7/master-v16
Pull-Request: https://github.com/git/git/pull/781

Range-diff vs v15:

1: 02d849784f ! 1: d235a576b4 Support auto-merge for meld to follow the vim-diff behavior

     @@ mergetools/meld: diff_cmd () {
      -	else
      -		meld_has_output_option=false
      +		meld_use_auto_merge_option=$(
     -+			git --bool-or-str config mergetool.meld.useAutoMerge)
     ++			git config --bool-or-str mergetool.meld.useAutoMerge)
      +		case "$meld_use_auto_merge_option" in
      +		true|false)
      +			: use well formatted boolean value

 Documentation/config/mergetool.txt | 10 ++++
 builtin/config.c                   | 19 +++++++
 config.c                           | 14 ++++++
 config.h                           |  7 +++
 mergetools/meld                    | 81 ++++++++++++++++++++++++------
 5 files changed, 115 insertions(+), 16 deletions(-)

index 09ed31dbfa..16a27443a3 100644
@@ -30,6 +30,16 @@ mergetool.meld.hasOutput::
 	to `true` tells Git to unconditionally use the `--output` option,
 	and `false` avoids using `--output`.
 
+mergetool.meld.useAutoMerge::
+	When the `--auto-merge` is given, meld will merge all non-conflicting
+	parts automatically, highlight the conflicting parts and wait for
+	user decision.  Setting `mergetool.meld.useAutoMerge` to `true` tells
+	Git to unconditionally use the `--auto-merge` option with `meld`.
+	Setting this value to `auto` makes git detect whether `--auto-merge`
+	is supported and will only use `--auto-merge` when available.  A
+	value of `false` avoids using `--auto-merge` altogether, and is the
+	default value.
+
 mergetool.keepBackup::
 	After performing a merge, the original file with conflict markers
 	can be saved as a file with a `.orig` extension.  If this variable

index ee4aef6a35..6f2ddadc80 100644
@@ -65,6 +65,7 @@ static int show_scope;
 #define TYPE_PATH		4
 #define TYPE_EXPIRY_DATE	5
 #define TYPE_COLOR		6
+#define TYPE_BOOL_OR_STR        7
 
 #define OPT_CALLBACK_VALUE(s, l, v, h, i) \
 	{ OPTION_CALLBACK, (s), (l), (v), NULL, (h), PARSE_OPT_NOARG | \

@@ -94,6 +95,8 @@ static int option_parse_type(const struct option *opt, const char *arg,
 			new_type = TYPE_INT;
 		else if (!strcmp(arg, "bool-or-int"))
 			new_type = TYPE_BOOL_OR_INT;
+		else if (!strcmp(arg, "bool-or-str"))
+			new_type = TYPE_BOOL_OR_STR;
 		else if (!strcmp(arg, "path"))
 			new_type = TYPE_PATH;
 		else if (!strcmp(arg, "expiry-date"))

@@ -149,6 +152,7 @@ static struct option builtin_config_options[] = {
 	OPT_CALLBACK_VALUE(0, "bool", &type, N_("value is \"true\" or \"false\""), TYPE_BOOL),
 	OPT_CALLBACK_VALUE(0, "int", &type, N_("value is decimal number"), TYPE_INT),
 	OPT_CALLBACK_VALUE(0, "bool-or-int", &type, N_("value is --bool or --int"), TYPE_BOOL_OR_INT),
+	OPT_CALLBACK_VALUE(0, "bool-or-str", &type, N_("value is --bool or string"), TYPE_BOOL_OR_STR),
 	OPT_CALLBACK_VALUE(0, "path", &type, N_("value is a path (file or directory name)"), TYPE_PATH),
 	OPT_CALLBACK_VALUE(0, "expiry-date", &type, N_("value is an expiry date"), TYPE_EXPIRY_DATE),
 	OPT_GROUP(N_("Other")),

@@ -250,6 +254,13 @@ static int format_config(struct strbuf *buf, const char *key_, const char *value
 				strbuf_addstr(buf, v ? "true" : "false");
 			else
 				strbuf_addf(buf, "%d", v);
+		} else if (type == TYPE_BOOL_OR_STR) {
+			int is_bool, v;
+			v = git_config_bool_or_str(NULL, key_, value_, &is_bool);
+			if (is_bool)
+				strbuf_addstr(buf, v ? "true" : "false");
+			else
+				strbuf_addstr(buf, value_);
 		} else if (type == TYPE_PATH) {
 			const char *v;
 			if (git_config_pathname(&v, key_, value_) < 0)

@@ -411,6 +422,14 @@ static char *normalize_value(const char *key, const char *value)
 		else
 			return xstrdup(v ? "true" : "false");
 	}
+	if (type == TYPE_BOOL_OR_STR) {
+		int is_bool, v;
+		v = git_config_bool_or_str(NULL, key, value, &is_bool);
+		if (!is_bool)
+			return xstrdup(value);
+		else
+			return xstrdup(v ? "true" : "false");
+	}
 	if (type == TYPE_COLOR) {
 		char v[COLOR_MAXLEN];
 		if (git_config_color(v, key, value))

index 8db9c77098..4c6c06d10b 100644
@@ -1100,6 +1100,20 @@ int git_config_bool_or_int(const char *name, const char *value, int *is_bool)
 	return git_config_int(name, value);
 }
 
+int git_config_bool_or_str(const char **dest, const char *name, const char *value, int *is_bool)
+{
+	int v = git_parse_maybe_bool_text(value);
+	if (0 <= v) {
+		*is_bool = 1;
+		return v;
+	}
+	*is_bool = 0;
+	if (dest != NULL)
+	  return git_config_string(dest, name, value);
+	else
+	  return 0;
+}
+
 int git_config_bool(const char *name, const char *value)
 {
 	int discard;

index 060874488f..175b88d9c5 100644
@@ -217,6 +217,13 @@ ssize_t git_config_ssize_t(const char *, const char *);
  */
 int git_config_bool_or_int(const char *, const char *, int *);
 
+/**
+ * Same as `git_config_bool`, except that `is_bool` flag is unset, then if
+ * `dest` parameter is non-NULL, it allocates and copies the value string
+ * into the `dest`, if `dest` is NULL and `is_bool` flag is unset it return 0.
+ */
+int git_config_bool_or_str(const char **, const char *, const char *, int *);
+
 /**
  * Parse a string into a boolean value, respecting keywords like "true" and
  * "false". Integer values are converted into true/false values (when they

base-commit: 07d8ea56f2ecb64b75b92264770c0a664231ce17

gitgitgadget

It is quite clear in this hunk that that the previous one was not even proofread before sending X-<.

	if (git_config_bool_or_str(...)) {
		... do one thing ...
	} else {
		... do something else ...
	}

	if (type == TYPE_BOOL_OR_STRING) {
		int v = git_parse_maybe_bool(value);
		if (v < 0)
			return xstrdup(value);
		else
			return xstrdup(v ? "true" : "false");
	}

		meld_use_auto_merge_option=$(
			git config --bool-or-str mergetool.meld.useAutoMerge
		)

Hi Junio,

Apologize for the [PATCH v16] which is not well thoughtful, and I totally agree that we will not paying too much attention before upcoming release. I'll rollback changes to preview one, thank you so much.

Best Regards
Lin

Just for fun, I've queued the following on top of v16 and merged the result to 'seen'.

As this adds a new feature to "git config", it also needs updates to Documentation/git-config.txt and tests for the feature, and it probably makes sense to make it a two-patch series. Everything related to the "git config" enhancement as 1/2, and change to mergetools/meld as 2/2.

 builtin/config.c | 16 +++++++---------
 config.c         | 14 --------------
 config.h         |  7 -------
 mergetools/meld  | 16 ++++++++++------
 4 files changed, 17 insertions(+), 36 deletions(-)

index 6f2ddadc80..7891e070a4 100644
@@ -65,7 +65,7 @@ static int show_scope;
 #define TYPE_PATH		4
 #define TYPE_EXPIRY_DATE	5
 #define TYPE_COLOR		6
-#define TYPE_BOOL_OR_STR        7
+#define TYPE_BOOL_OR_STR	7
 
 #define OPT_CALLBACK_VALUE(s, l, v, h, i) \
 	{ OPTION_CALLBACK, (s), (l), (v), NULL, (h), PARSE_OPT_NOARG | \

@@ -255,12 +255,11 @@ static int format_config(struct strbuf *buf, const char *key_, const char *value
 			else
 				strbuf_addf(buf, "%d", v);
 		} else if (type == TYPE_BOOL_OR_STR) {
-			int is_bool, v;
-			v = git_config_bool_or_str(NULL, key_, value_, &is_bool);
-			if (is_bool)
-				strbuf_addstr(buf, v ? "true" : "false");
-			else
+			int v = git_parse_maybe_bool(value_);
+			if (v < 0)
 				strbuf_addstr(buf, value_);
+			else
+				strbuf_addstr(buf, v ? "true" : "false");
 		} else if (type == TYPE_PATH) {
 			const char *v;
 			if (git_config_pathname(&v, key_, value_) < 0)

@@ -423,9 +422,8 @@ static char *normalize_value(const char *key, const char *value)
 			return xstrdup(v ? "true" : "false");
 	}
 	if (type == TYPE_BOOL_OR_STR) {
-		int is_bool, v;
-		v = git_config_bool_or_str(NULL, key, value, &is_bool);
-		if (!is_bool)
+		int v = git_parse_maybe_bool(value);
+		if (v < 0)
 			return xstrdup(value);
 		else
 			return xstrdup(v ? "true" : "false");

index 4c6c06d10b..8db9c77098 100644
@@ -1100,20 +1100,6 @@ int git_config_bool_or_int(const char *name, const char *value, int *is_bool)
 	return git_config_int(name, value);
 }
 
-int git_config_bool_or_str(const char **dest, const char *name, const char *value, int *is_bool)
-{
-	int v = git_parse_maybe_bool_text(value);
-	if (0 <= v) {
-		*is_bool = 1;
-		return v;
-	}
-	*is_bool = 0;
-	if (dest != NULL)
-	  return git_config_string(dest, name, value);
-	else
-	  return 0;
-}
-
 int git_config_bool(const char *name, const char *value)
 {
 	int discard;

index 175b88d9c5..060874488f 100644
@@ -217,13 +217,6 @@ ssize_t git_config_ssize_t(const char *, const char *);
  */
 int git_config_bool_or_int(const char *, const char *, int *);
 
-/**
- * Same as `git_config_bool`, except that `is_bool` flag is unset, then if
- * `dest` parameter is non-NULL, it allocates and copies the value string
- * into the `dest`, if `dest` is NULL and `is_bool` flag is unset it return 0.
- */
-int git_config_bool_or_str(const char **, const char *, const char *, int *);
-
 /**
  * Parse a string into a boolean value, respecting keywords like "true" and
  * "false". Integer values are converted into true/false values (when they

index bc2ea894d7..aab4ebb935 100644
@@ -36,7 +36,7 @@ check_meld_for_features () {
 	then
 		meld_has_output_option=$(git config --bool mergetool.meld.hasOutput)
 		case "$meld_has_output_option" in
-		true|false)
+		true | false)
 			: use configured value
 			;;
 		*)

@@ -44,7 +44,7 @@ check_meld_for_features () {
 			init_meld_help_msg
 
 			case "$meld_help_msg" in
-			*"--output="*|*'[OPTION...]'*)
+			*"--output="* | *'[OPTION...]'*)
 				# All version that has [OPTION...] supports --output
 				meld_has_output_option=true
 				;;