From: Junio C Hamano <gitster@pobox.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: Ashutosh Bapat <ashutosh.bapat@enterprisedb.com>,
git@vger.kernel.org, Michael Haggerty <mhagger@alum.mit.edu>,
Michael J Gruber <git@drmicha.warpmail.net>,
Matthieu Moy <Matthieu.Moy@imag.fr>
Subject: Re: Bug with fixup and autosquash
Date: Thu, 09 Feb 2017 14:16:03 -0800 [thread overview]
Message-ID: <xmqqd1ernh7g.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <alpine.DEB.2.20.1702092301070.3496@virtualbox> (Johannes Schindelin's message of "Thu, 9 Feb 2017 23:02:51 +0100 (CET)")
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> Almost. While I fixed the performance issues as well as the design
> allowed, I happened to "fix" the problem where an incomplete prefix match
> could be favored over an exact match.
Hmph. Would it require too much further work to do what you said
the code does:
> The rebase--helper code (specifically, the patch moving autosquash logic
> into it: https://github.com/dscho/git/commit/7d0831637f) tries to match
> exact onelines first, and falls back to prefix matching only after that.
If the code matches exact onlines and then falls back to prefix, I
do not think incomplete prefix would be mistakenly chosen over an
exact one, so perhaps your code already does the right thing?
next prev parent reply other threads:[~2017-02-09 22:24 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-08 10:10 Bug with fixup and autosquash Ashutosh Bapat
2017-02-08 22:55 ` Junio C Hamano
2017-02-09 4:06 ` Ashutosh Bapat
2017-02-09 15:07 ` Michael J Gruber
2017-02-09 19:46 ` Junio C Hamano
2017-02-09 20:55 ` Johannes Schindelin
2017-02-09 21:21 ` Junio C Hamano
2017-02-09 22:02 ` Johannes Schindelin
2017-02-09 22:16 ` Junio C Hamano [this message]
2017-02-10 15:57 ` Johannes Schindelin
2017-02-10 19:02 ` Philip Oakley
2017-04-25 11:30 ` Johannes Schindelin
2017-02-09 23:31 ` Philip Oakley
2017-02-10 14:02 ` Johannes Schindelin
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=xmqqd1ernh7g.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=Matthieu.Moy@imag.fr \
--cc=ashutosh.bapat@enterprisedb.com \
--cc=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
--cc=mhagger@alum.mit.edu \
/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).