[PATCHv2] Make difftool.prompt fall back to mergetool.prompt

[PATCHv2] Make difftool.prompt fall back to mergetool.prompt

[Sebastian Schuberth]

The documentation states that "git-difftool falls back to git-mergetool
config variables when the difftool equivalents have not been defined".
Until now, this was not the case for "difftool.prompt".

Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
---
 git-difftool--helper.sh |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/git-difftool--helper.sh b/git-difftool--helper.sh
index 57e8e32..3438aba 100755
--- a/git-difftool--helper.sh
+++ b/git-difftool--helper.sh
@@ -12,7 +12,8 @@ TOOL_MODE=diff
 # difftool.prompt controls the default prompt/no-prompt behavior
 # and is overridden with $GIT_DIFFTOOL*_PROMPT.
 should_prompt () {
-	prompt=$(git config --bool difftool.prompt || echo true)
+	prompt_merge=$(git config --bool mergetool.prompt || echo true)
+	prompt=$(git config --bool difftool.prompt || echo $prompt_merge)
 	if test "$prompt" = true; then
 		test -z "$GIT_DIFFTOOL_NO_PROMPT"
 	else
-- 
1.6.6.265.ga0f40

Re: [PATCHv2] Make difftool.prompt fall back to mergetool.prompt

[David Aguilar]

On Jan 22, 2010, at 9:58 AM, Junio C Hamano <gitster@pobox.com> wrote:

> Sebastian Schuberth <sschuberth@gmail.com> writes:
>
>> The documentation states that "git-difftool falls back to git- 
>> mergetool
>> config variables when the difftool equivalents have not been  
>> defined".
>> Until now, this was not the case for "difftool.prompt".
>>
>> Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
>
> David, does this look ok?  It seems to match the discussion between  
> you I
> saw yesterday, but just checking to make sure (if "yes" please Ack).

Acked-by: David Aguilar <davvid@gmail.com>

I would like to see a testcase to ensure we don't break it in the  
future, though.

Thanks Sebastian, Junio.

Sebastian, I you don't send a test I'll try to send one tonight.


>
> Is it Ok that today I see only this patch not two-patch series on the
> topic (iow, has the other patch been withdrawn)?  I didn't folow the
> discussion very closely.
>
> Thanks.
>
>> ---
>> git-difftool--helper.sh |    3 ++-
>> 1 files changed, 2 insertions(+), 1 deletions(-)
>>
>> diff --git a/git-difftool--helper.sh b/git-difftool--helper.sh
>> index 57e8e32..3438aba 100755
>> --- a/git-difftool--helper.sh
>> +++ b/git-difftool--helper.sh
>> @@ -12,7 +12,8 @@ TOOL_MODE=diff
>> # difftool.prompt controls the default prompt/no-prompt behavior
>> # and is overridden with $GIT_DIFFTOOL*_PROMPT.
>> should_prompt () {
>> -    prompt=$(git config --bool difftool.prompt || echo true)
>> +    prompt_merge=$(git config --bool mergetool.prompt || echo true)
>> +    prompt=$(git config --bool difftool.prompt || echo  
>> $prompt_merge)
>>    if test "$prompt" = true; then
>>        test -z "$GIT_DIFFTOOL_NO_PROMPT"
>>    else
>> -- 
>> 1.6.6.265.ga0f40

Re: [PATCHv2] Make difftool.prompt fall back to mergetool.prompt

[Sebastian Schuberth]

On Fri, Jan 22, 2010 at 22:24, David Aguilar <davvid@gmail.com> wrote:

> Sebastian, I you don't send a test I'll try to send one tonight.

I'd be glad if you could propose a testcase. Thanks.

-- 
Sebastian Schuberth