git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Kevin Ballard <kevin@sb.org>
Date
Nov 8, 2010, 11:10 UTC
Message-ID
<FB418838-D9A9-4FA6-8C32-FDC5F51DE783@sb.org>
In-Reply-To
<20101108115239.7309504f@chalon.bertin.fr>
On Nov 8, 2010, at 2:52 AM, Yann Dirson wrote:
Show 10 quoted lines
> 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
Previous: Yann DirsonNext: Kevin Ballard
Message 12 of 13 in “rebase: better rearranging of fixup!/squash! lines with --autosquash”
  1. 1/2 rebase: better rearranging of fixup!/squash! lines with --autosquashKevin Ballard, Nov 4, 2010
  2. 2/2 rebase: teach --autosquash to match on sha1 in addition to messageKevin Ballard, Nov 4, 2010
  3. Kevin BallardNov 4, 2010
  4. Sverre RabbelierNov 4, 2010
  5. Kevin BallardNov 4, 2010
  6. Junio C HamanoNov 4, 2010
  7. 1/2 rebase: better rearranging of fixup!/squash! lines with --autosquashKevin Ballard, Nov 4, 2010
  8. 2/2 rebase: teach --autosquash to match on sha1 in addition to messageKevin Ballard, Nov 4, 2010
  9. Peter KreftingNov 5, 2010
  10. 1/2 rebase: better rearranging of fixup!/squash! lines with --autosquashKevin Ballard, Nov 8, 2010
  11. Yann DirsonNov 8, 2010
  12. Kevin BallardNov 8, 2010
  13. 2/2 rebase: teach --autosquash to match on sha1 in addition to messageKevin Ballard, Nov 8, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.