Re: [PATCHv3 1/2] rebase: better rearranging of fixup!/squash! lines with --autosquash

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Nov 8, 2010, at 2:52 AM, Yann Dirson wrote:

> Kevin wrote:
>> The current behvaior of --autosquash can duplicate fixup!/squash! lines
>> if they match multiple commits, and it can also apply them to commits
>> that come after them in the todo list.
> 
> That last part of the sentence does not match my experience - it looks
> like you describe as a bug a nonexistent feature I miss :)
> 
> See http://marc.info/?l=git&m=128784082701920 for a testcase that
> exhibits what I think is a problem.

The bug is definitely present. It seems what you're describing is that you
want it to continue to place that fixup! there, but you want it to skip the
pick line that occurs earlier in the TODO list. My feeling is that this is
purely a bug, and should be fixed to not place the fixup! line after the
later commit.

If you do want the behavior where it skips the pick and places the fixup!
line after the later commit, I would encourage you to file a separate patch
for that.

-Kevin Ballard
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]