From: Raman Gupta <rocketraman@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH v2] contrib/rerere-train: optionally overwrite existing resolutions
Date: Wed, 26 Jul 2017 15:06:51 -0400 [thread overview]
Message-ID: <32b61c4b-5e58-30d9-4345-8036bc805019@gmail.com> (raw)
In-Reply-To: <xmqqmv7rrs45.fsf@gitster.mtv.corp.google.com>
On 26/07/17 02:05 PM, Junio C Hamano wrote:
> I haven't tried this patch, but would this work well with options
> meant for the 'git rev-list --parents "$@"' that grabs the list of
> merge commits to learn from? e.g.
>
> $ contrib/rerere-train.sh -n 4 --merges master
> $ contrib/rerere-train.sh --overwrite -n 4 --merges master
> $ contrib/rerere-train.sh -n 4 --overwrite --merges master
>
> I do not think it is necessary to make the last one work; as long as
> the first two work as expected, we are good even if the last one
> dies with a sensible message e.g. "options X, Y and Z must be given
> before other options" (currently "X, Y and Z" consists only of
> "--overwrite", but I think you get what I mean).
You're right -- I didn't try all the cases. I wasn't able to figure
out how to get `rev-parse --parseopt` to deal with this situation, so
I did it manually. I'm not super-happy with the result, but it does
work. Look for PATCH v3.
Regards,
Raman
next prev parent reply other threads:[~2017-07-26 19:06 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-25 14:34 [PATCH/RFC] contrib: rerere-train overwrites existing resolutions Raman Gupta
2017-07-25 21:18 ` Junio C Hamano
2017-07-25 22:48 ` [PATCH v2] contrib/rerere-train: optionally overwrite " Raman Gupta
2017-07-26 18:05 ` Junio C Hamano
2017-07-26 19:06 ` Raman Gupta [this message]
2017-07-26 20:41 ` Junio C Hamano
2017-07-28 18:40 ` Raman Gupta
2017-07-26 19:08 ` [PATCH v3] " Raman Gupta
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=32b61c4b-5e58-30d9-4345-8036bc805019@gmail.com \
--to=rocketraman@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).