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

Bug with fixup and autosquash

From
ABAshutosh Bapat <ashutosh.bapat@enterprisedb.com>
Date
Feb 8, 2017, 10:10 UTC
Message-ID
<CAFjFpRe8zqxs4OLbCrjnuEzF=75sbBJ+HuZqek49B=O=TFHq8A@mail.gmail.com>

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. yyyyyy This is prefix xxxxxx This is prefix and message

xxxxxx comitted before yyyyyy

Now I commit a fixup to yyyyyy using git commit --fixup yyyyyy zzzzzz fixup! This is prefix

When I run git rebase -i --autosquash, the script it shows me looks like pick xxxxxx This is prefix and message fixup zzzzzz fixup! This is prefix pick yyyyyy This is prefix

I think the correct order is pick xxxxxx This is prefix and message pick yyyyyy This is prefix fixup zzzzzz fixup! This is prefix

Is that right?

I am using [ubuntu]git --version git version 1.7.9.5

-- Best Wishes, Ashutosh Bapat EnterpriseDB Corporation The Postgres Database Company

Next: Junio C Hamano
Message 1 of 14 in “Bug with fixup and autosquash”
  1. Ashutosh BapatFeb 8, 2017
  2. Junio C HamanoFeb 8, 2017
  3. Ashutosh BapatFeb 9, 2017
  4. Michael J GruberFeb 9, 2017
  5. Junio C HamanoFeb 9, 2017
  6. Johannes SchindelinFeb 9, 2017
  7. Junio C HamanoFeb 9, 2017
  8. Johannes SchindelinFeb 9, 2017
  9. Junio C HamanoFeb 9, 2017
  10. Johannes SchindelinFeb 10, 2017
  11. Philip OakleyFeb 10, 2017
  12. Johannes SchindelinApr 25, 2017
  13. Philip OakleyFeb 9, 2017
  14. Johannes SchindelinFeb 10, 2017

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.