From: Junio C Hamano <gitster@pobox.com>
To: Paul Tan <pyokagan@gmail.com>
Cc: git@vger.kernel.org,
Johannes Schindelin <johannes.schindelin@gmx.de>,
Stefan Beller <sbeller@google.com>,
Remi Lespinet <remi.lespinet@ensimag.grenoble-inp.fr>,
Jeff King <peff@peff.net>
Subject: Re: [PATCH v2 0/3] am: let command-line options override saved options
Date: Tue, 04 Aug 2015 14:12:33 -0700 [thread overview]
Message-ID: <xmqqbnem69mm.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1438697116-27799-1-git-send-email-pyokagan@gmail.com> (Paul Tan's message of "Tue, 4 Aug 2015 22:05:13 +0800")
Paul Tan <pyokagan@gmail.com> writes:
> Let command-line options override saved options in git-am when resuming
>
> This is a re-roll of [v1]. Previous versions:
>
> [v1] http://thread.gmane.org/gmane.comp.version-control.git/274789
>
> When resuming, git-am mistakenly ignores command-line options.
>
> For instance, when a patch fails to apply with "git am patch", subsequently
> running "git am --3way" would not cause git-am to fall back on attempting a
> threeway merge. This occurs because by default the --3way option is saved as
> "false", and the saved am options are loaded after the command-line options are
> parsed, thus overwriting the command-line options when resuming.
>
> [PATCH 1/3] tweaks test-terminal.perl to redirect the stdin of the child
> process to a pty. This is to support the tests in [PATCH 2/3].
>
> [PATCH 2/3] fixes builtin/am.c, enabling command-line options to override saved
> options. However, even with this patch, the following command-line options have
> no effect when resuming:
>
> * --signoff overriding --no-signoff
>
> * --no-keep overriding --keep
>
> * --message-id overriding --no-message-id
>
> * --scissors overriding --no-scissors
>
> This is because they are only taken into account during the mail-parsing stage,
> which is skipped over when resuming.
It is more like "which has already happened", so I would tend to
think that these are the right things to ignore. Otherwise, a
pretty common sequence would not work well ...
$ git am mbox
... conflicted ...
$ edit .git/rebase-apply/patch
$ git am
... if the "resuming" invocation re-split the message by running
mailinfo again, the edit by the user will be lost.
next prev parent reply other threads:[~2015-08-04 21:12 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-24 17:48 "git am" and then "git am -3" regression? Junio C Hamano
2015-07-24 18:09 ` Jeff King
2015-07-26 5:03 ` Paul Tan
2015-07-26 5:21 ` Jeff King
2015-07-27 8:09 ` Matthieu Moy
2015-07-27 8:32 ` Jeff King
2015-07-27 14:21 ` Junio C Hamano
2015-07-28 16:43 ` [PATCH] am: let command-line options override saved options Paul Tan
2015-07-28 16:48 ` Junio C Hamano
2015-07-28 17:09 ` Junio C Hamano
2015-07-31 10:58 ` Paul Tan
2015-07-31 16:04 ` Junio C Hamano
2015-08-01 0:59 ` Paul Tan
2015-08-04 14:05 ` [PATCH v2 0/3] " Paul Tan
2015-08-04 21:12 ` Junio C Hamano [this message]
2015-08-04 14:08 ` Paul Tan
2015-08-04 14:08 ` [PATCH v2 1/3] test_terminal: redirect child process' stdin to a pty Paul Tan
2015-08-06 22:15 ` Eric Sunshine
2015-08-12 4:16 ` Paul Tan
2015-08-04 14:08 ` [PATCH v2 2/3] am: let command-line options override saved options Paul Tan
2015-08-04 14:08 ` [PATCH v2 3/3] am: let --signoff override --no-signoff Paul Tan
2015-08-07 9:29 ` Johannes Schindelin
2015-08-12 3:06 ` Paul Tan
2015-08-12 3:07 ` Paul Tan
2015-08-05 15:41 ` [PATCH v2 0/3] am: let command-line options override saved options Junio C Hamano
2015-08-05 17:51 ` Paul Tan
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=xmqqbnem69mm.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=johannes.schindelin@gmx.de \
--cc=peff@peff.net \
--cc=pyokagan@gmail.com \
--cc=remi.lespinet@ensimag.grenoble-inp.fr \
--cc=sbeller@google.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).