Re: [PATCH 10/9 v4] difftool: fix regression in '--prompt' options

From: Tim Henigan <tim.henigan@gmail.com>
Date: Mar 22, 2012, 19:01 UTC
Message-ID: <CAFouetj+myKuUqw3-SwnbZ-=Sey29q9xYdaW4noHp_ebkmrk-A@mail.gmail.com>
In-Reply-To: <7v3990zi5h.fsf@alter.siamese.dyndns.org>

On Thu, Mar 22, 2012 at 12:59 PM, Junio C Hamano <gitster@pobox.com> wrote:

Show 8 quoted lines

> Tim Henigan <tim.henigan@gmail.com> writes:
>
>> v5 of the patch will use Getopt to parse the '--[no-]prompt' options
>> again.  I will also add a new patch to the series to implement
>> '--no-gui'.
>
> Sensible.  At that point, it should be rolled into an updated [1/9] so
> that Getopt::Long is used correctly from the get-go, I think.

That sounds reasonable.  I will re-roll the series with the following changes:
  - Squash "fix regression in '--prompt' options" into the first patch
  - Squash "teach dir-diff to copy modified files back" into the
implementation of --dir-diff
  - Squash "add test for difftool --tool-help" into implementation of
--tool-help
  - Squash "add tests for difftool --dir-diff" into the implementation
of --dir-diff
  - Reorder so that "add '--no-gui' as an option" is patch #2
(immediately after change to Getopts::Long)

This should make the series look cleaner and also insure that new features and their tests are added in the same commit.

I will resend the entire patch series (will be v6) when this is done.

Does this sound like a good plan?