From: Tim Henigan <tim.henigan@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Thomas Rast <trast@student.ethz.ch>,
git@vger.kernel.org, davvid@gmail.com
Subject: Re: [PATCH 10/9 v4] difftool: fix regression in '--prompt' options
Date: Thu, 22 Mar 2012 15:01:12 -0400 [thread overview]
Message-ID: <CAFouetj+myKuUqw3-SwnbZ-=Sey29q9xYdaW4noHp_ebkmrk-A@mail.gmail.com> (raw)
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:
> 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?
next prev parent reply other threads:[~2012-03-22 19:01 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-21 19:35 [PATCH v3 0/9] difftool: teach command to perform directory diffs Tim Henigan
2012-03-21 19:35 ` [PATCH v3 7/9] difftool: teach difftool to handle " Tim Henigan
2012-03-21 19:35 ` [PATCH v3 8/9] difftool: teach dir-diff to copy modified files back to working tree Tim Henigan
2012-03-21 19:35 ` [PATCH v3 10/9] difftool: do not allow mix of '--prompt' with '--no-prompt' Tim Henigan
2012-03-21 20:14 ` Junio C Hamano
2012-03-22 1:53 ` [PATCH 10/9 v4] difftool: fix regression in '--prompt' options Tim Henigan
2012-03-22 4:09 ` Junio C Hamano
2012-03-22 8:19 ` Thomas Rast
2012-03-22 13:51 ` Tim Henigan
2012-03-22 16:59 ` Junio C Hamano
2012-03-22 19:01 ` Tim Henigan [this message]
2012-03-22 19:13 ` Junio C Hamano
2012-03-22 16:57 ` Junio C Hamano
2012-03-21 19:35 ` [PATCH v3 11/9] t7800: add test for difftool --tool-help Tim Henigan
2012-03-21 19:36 ` [PATCH v3 12/9] t7800: add tests for difftool --dir-diff Tim Henigan
2012-03-22 9:53 ` David Aguilar
2012-03-22 13:55 ` Tim Henigan
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='CAFouetj+myKuUqw3-SwnbZ-=Sey29q9xYdaW4noHp_ebkmrk-A@mail.gmail.com' \
--to=tim.henigan@gmail.com \
--cc=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=trast@student.ethz.ch \
/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).