From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Remi Lespinet <remi.lespinet@ensimag.grenoble-inp.fr>,
git@vger.kernel.org, Paul Tan <pyokagan@gmail.com>
Subject: Re: "git am" and then "git am -3" regression?
Date: Fri, 24 Jul 2015 11:09:21 -0700 [thread overview]
Message-ID: <20150724180921.GA17730@peff.net> (raw)
In-Reply-To: <xmqqr3nxmopp.fsf@gitster.dls.corp.google.com>
On Fri, Jul 24, 2015 at 10:48:18AM -0700, Junio C Hamano wrote:
> Hmm, there seems to be some glitches around running "am -3"
> after a failed "am" between 'maint' and 'master'.
>
> When I try the following sequence, the 'am' from 'maint' succeeds,
> but 'am' in 'master' fails:
>
> * Save Eric's "minor documetation improvements" $gmane/274537
> to a file.
>
> * "git checkout e177995" (that's "next^0") and then apply them with
> "git am" (no -3 necessary).
>
> * "git checkout 272be14" (that's "es/worktree-add-cleanup^0") and
> then apply them with "git am" (without -3).
>
> This is expected to stop at 2/6, as the context has changed
> between 272be14 and the tip of 'next'.
>
> * "git am -3". This should restart and resolve cleanly.
Thanks for diagnosing. This bit me the other day, but I hadn't had time
to look at it yet (and I "am" a lot less than you do, I imagine).
> Reverting d96a275b91bae1800cd43be0651e886e7e042a17 seems to fix it,
> so that is what I'll do for 2.5 final.
Yeah, I think this hunk is to blame (though I just read the code and did not
test):
@@ -658,6 +665,8 @@ fi
if test "$(cat "$dotest/threeway")" = t
then
threeway=t
+else
+ threeway=f
fi
It comes after the command-line option parsing, so it overrides our option (I
think that running "git am -3" followed by "git am --no-3way" would have the
same problem). It cannot just check whether $threeway is unset, though, as it
may have come from the config. We'd need a separate variable, the way the code
is ordered now.
Ideally the code would just be ordered as:
- load config from git-config
- override that with defaults inherited from a previous run
- override that with command-line parsing
but I don't know if there are other ordering gotchas that would break.
It does look like that is how Paul's builtin/am.c does it, which makes
me think it might not be broken. It's also possibly I've horribly
misdiagnosed the bug. ;)
-Peff
next prev parent reply other threads:[~2015-07-24 18:09 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 [this message]
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
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=20150724180921.GA17730@peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pyokagan@gmail.com \
--cc=remi.lespinet@ensimag.grenoble-inp.fr \
/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).