Re: Bug with fixup and autosquash

2017-04-25 Thread Johannes Schindelin
Hi Philip, On Fri, 10 Feb 2017, Philip Oakley wrote: > From: "Johannes Schindelin" > > > > On Thu, 9 Feb 2017, Junio C Hamano wrote: > > > > > Johannes Schindelin writes: > > > > > > > Almost. While I fixed the performance issues as well as the design > > > > allowed, I happened to "fix" the pr

Re: Bug with fixup and autosquash

2017-02-10 Thread Philip Oakley
From: "Johannes Schindelin" Hi Junio, On Thu, 9 Feb 2017, Junio C Hamano wrote: Johannes Schindelin 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

Re: Bug with fixup and autosquash

2017-02-10 Thread Johannes Schindelin
Hi Junio, On Thu, 9 Feb 2017, Junio C Hamano wrote: > Johannes Schindelin 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

Re: Bug with fixup and autosquash

2017-02-10 Thread Johannes Schindelin
Hi Philip, On Thu, 9 Feb 2017, Philip Oakley wrote: > From: "Johannes Schindelin" > Sent: Thursday, February 09, 2017 8:55 PM > > > The rebase--helper code (specifically, the patch moving autosquash > > logic into it: https://github.com/dscho/git/commit/7d0831637f) tries > > to match exact oneli

Re: Bug with fixup and autosquash

2017-02-09 Thread Philip Oakley
From: "Johannes Schindelin" Sent: Thursday, February 09, 2017 8:55 PM Hi Ashutosh and Junio, On Wed, 8 Feb 2017, Junio C Hamano wrote: Ashutosh Bapat writes: > I have been using git rebase heavily these days and seem to have found > a bug. > > If there are two commit messages which have sam

Re: Bug with fixup and autosquash

2017-02-09 Thread Junio C Hamano
Johannes Schindelin 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: >

Re: Bug with fixup and autosquash

2017-02-09 Thread Johannes Schindelin
Hi Junio, On Thu, 9 Feb 2017, Junio C Hamano wrote: > Johannes Schindelin writes: > > > This prefix match also happens to introduce a serious performance problem, > > which is why I "fixed" this issue in the rebase--helper already (which is > > the case if you are using Git for Windows, whose m

Re: Bug with fixup and autosquash

2017-02-09 Thread Junio C Hamano
Johannes Schindelin writes: > This prefix match also happens to introduce a serious performance problem, > which is why I "fixed" this issue in the rebase--helper already (which is > the case if you are using Git for Windows, whose master branch builds on > Linux and MacOSX as well). I quoted "fi

Re: Bug with fixup and autosquash

2017-02-09 Thread Johannes Schindelin
Hi Ashutosh and Junio, On Wed, 8 Feb 2017, Junio C Hamano wrote: > Ashutosh Bapat writes: > > > I have been using git rebase heavily these days and seem to have found > > a bug. > > > > If there are two commit messages which have same prefix e.g. > > yy This is prefix > > xx This is pre

Re: Bug with fixup and autosquash

2017-02-09 Thread Junio C Hamano
Michael J Gruber writes: > Junio C Hamano venit, vidit, dixit 08.02.2017 23:55: > >> Let's hear from some of those (Cc'ed) who were involved in an >> earlier --autosquash thread. >> >> https://public-inbox.org/git/cover.1259934977.git.mhag...@alum.mit.edu/ >> >> >> [Footnote] >> >> *1* "rebas

Re: Bug with fixup and autosquash

2017-02-09 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 08.02.2017 23:55: > Ashutosh Bapat writes: > >> I have been using git rebase heavily these days and seem to have found a bug. >> >> If there are two commit messages which have same prefix e.g. >> yy This is prefix >> xx This is prefix and message >> >> x

Re: Bug with fixup and autosquash

2017-02-08 Thread Ashutosh Bapat
On Thu, Feb 9, 2017 at 4:25 AM, Junio C Hamano wrote: > Ashutosh Bapat writes: > >> I have been using git rebase heavily these days and seem to have found a bug. >> >> If there are two commit messages which have same prefix e.g. >> yy This is prefix >> xx This is prefix and message >> >>

Re: Bug with fixup and autosquash

2017-02-08 Thread Junio C Hamano
Ashutosh Bapat writes: > I have been using git rebase heavily these days and seem to have found a bug. > > If there are two commit messages which have same prefix e.g. > yy This is prefix > xx This is prefix and message > > xx comitted before yy > > Now I commit a fixup to yy

Bug with fixup and autosquash

2017-02-08 Thread Ashutosh Bapat
Hi Git-developers, First of all thanks for developing this wonderful scm tool. It's sooo versatile. I have been using git rebase heavily these days and seem to have found a bug. If there are two commit messages which have same prefix e.g. yy This is prefix xx This is prefix and message x