From: Johannes Sixt <j.sixt@viscovery.net>
To: Sebastian Schuberth <sschuberth@gmail.com>
Cc: git@vger.kernel.org, davvid@gmail.com
Subject: Re: [PATCH 1/2] Allow to override mergetool.prompt with $GIT_MERGETOOL*_PROMPT
Date: Wed, 20 Jan 2010 16:59:44 +0100 [thread overview]
Message-ID: <4B572870.6090001@viscovery.net> (raw)
In-Reply-To: <4B572192.2020606@gmail.com>
Sebastian Schuberth schrieb:
> +should_prompt_merge () {
> + local prompt=$(git config --bool mergetool.prompt || echo true)
'local' is not portable. (The next patch shouldn't introduce it, either.)
> -prompt=$(git config --bool mergetool.prompt || echo true)
> +should_prompt_merge
> +prompt=$?
Previously, prompt was either "true" or "false", but now it is a number.
This is not what the user (function merge_file) expects.
-- Hannes
next prev parent reply other threads:[~2010-01-20 15:59 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 [this message]
2010-01-20 16:10 ` Sebastian Schuberth
2010-01-21 7:44 ` David Aguilar
2010-01-21 10:10 ` Sebastian Schuberth
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=4B572870.6090001@viscovery.net \
--to=j.sixt@viscovery.net \
--cc=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=sschuberth@gmail.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).