From: Charles Bailey <charles@hashpling.org>
To: David Aguilar <davvid@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>,
Tim Henigan <tim.henigan@gmail.com>
Subject: Re: What should mergetool do with --no-prompt?
Date: Tue, 14 Aug 2012 08:18:23 +0100 [thread overview]
Message-ID: <20120814071823.GA21031@hashpling.org> (raw)
In-Reply-To: <CAJDDKr5TK910n603jcmoq6WoaLL9DX9hgwF3Y+MmjngMpAXPQw@mail.gmail.com>
On Tue, Aug 14, 2012 at 12:07:26AM -0700, David Aguilar wrote:
> Right now there are two code paths, resolving deletion conflicts
> and resolving symlink conflicts, in git-mergetool that do not
> honor --no-prompt. They force user-interaction with the shell
> even though the caller (such as a program) said that they do
> not want to be prompted.
>
> This was an oversight from when this option was first added.
>
> I think a simple and sensible thing to do would be for mergetool
> to skip over these entries when --no-prompt is supplied.
>
> Does this sound like a good idea?
--no-prompt is designed to remove the prompt before launching a
mergetool. This is because it is mostly pointless but does provide a
convenient point to interrupt (C-c) a large multifile conflict
resolution.
It was never supposed to be a batch mode switch. By it's very nature
mergetool is interactive so I don't see any advantage to pretending
otherwise.
If the documentation indicates otherwise then it's my opinion that
this is what needs to be fixed.
Charles.
next prev parent reply other threads:[~2012-08-14 7:24 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-14 7:07 What should mergetool do with --no-prompt? David Aguilar
2012-08-14 7:18 ` Charles Bailey [this message]
2012-08-14 15:06 ` Junio C Hamano
2012-08-14 17:09 ` Charles Bailey
2012-08-14 17:23 ` Junio C Hamano
2012-08-14 19:15 ` 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=20120814071823.GA21031@hashpling.org \
--to=charles@hashpling.org \
--cc=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=tim.henigan@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).