From: Sebastian Schuberth <sschuberth@gmail.com>
To: David Aguilar <davvid@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 1/2] Allow to override mergetool.prompt with $GIT_MERGETOOL*_PROMPT
Date: Thu, 21 Jan 2010 11:10:15 +0100 [thread overview]
Message-ID: <4B582807.8070504@gmail.com> (raw)
In-Reply-To: <20100121074427.GA26973@gmail.com>
On 21.01.2010 08:44, David Aguilar wrote:
> The GIT_DIFFTOOL*_PROMPT variables are implementation details
> about how git-difftool passes options to git-difftool--helper.
> We don't advertise them in the documentation so we probably
> shouldn't support them aside from what is needed for
> git-difftool. We can drop this part.
Thanks for the explanation, I already was wondering why they don't
appear in the docs.
> git-difftool falling back to mergetool.prompt when
> difftool.prompt is not available is good, especially
> since we advertise that feature.
>
> Once you drop the local declarations and the env. variable
> it should be good to go. Patch v2, soon?
If I drop env. variable support, I don't see much reason to introduce
the should_prompt_merge () at all. I'd then leave git-mergetool* as-is,
and directly run "git config --bool mergetool.prompt" inside
should_prompt_diff (). Would that be OK with you?
--
Sebastian Schuberth
next prev parent reply other threads:[~2010-01-21 10:10 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-20 15:30 [PATCH 1/2] Allow to override mergetool.prompt with $GIT_MERGETOOL*_PROMPT Sebastian Schuberth
2010-01-20 15:59 ` Johannes Sixt
2010-01-20 16:10 ` Sebastian Schuberth
2010-01-21 7:44 ` David Aguilar
2010-01-21 10:10 ` Sebastian Schuberth [this message]
2010-01-22 1:58 ` David Aguilar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4B582807.8070504@gmail.com \
--to=sschuberth@gmail.com \
--cc=davvid@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.