git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed

From: Andrew Pimlott <andrew@pimlott.net>
To: git@vger.kernel.org
Subject: rebase --autosquash does not handle fixup! of fixup!
Date: Tue, 11 Jun 2013 11:05:30 -0700	[thread overview]
Message-ID: <20130611180530.GA18488@oinkpad.pimlott.net> (raw)

git rebase -i --autosquash does not handle a fixup! of a fixup!, such as
the history:

    aaaaaaa fix nasty bug
    ...
    bbbbbbb fixup! fix nasty bug
    ...
    ccccccc fixup! fixup! fix nasty bug

--autosquash produces:

    pick aaaaaaa fix nasty bug
    fixup bbbbbbb fixup! fix nasty bug
    ...
    pick ccccccc fixup! fixup! fix nasty bug

This defeats the workflow I was hoping to use:

    git commit -m 'fix nasty bug'
    ...
    git commit --fixup :/nasty
    ...
    git commit --fixup :/nasty

The second :/nasty resolves to the previous fixup, not the initial
commit.  I could have made the regular expression more precise, but this
would be a hassle.

Would a change to support fixup! fixup! be considered?

Andrew

(Please Cc: me on replies.)

next             reply	other threads:[~2013-06-11 18:41 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-11 18:05 Andrew Pimlott [this message]
2013-06-11 18:50 ` rebase --autosquash does not handle fixup! of fixup! Thomas Rast
2013-06-14 19:31   ` [PATCH] rebase -i: fixup fixup! fixup! Andrew Pimlott
2013-06-15  6:50     ` Andrew Pimlott
2013-06-15 10:07       ` Junio C Hamano
2013-06-16  1:19         ` Junio C Hamano
2013-06-16 11:08         ` Thomas Rast
2013-06-17  2:38           ` Junio C Hamano
2013-06-17  8:07             ` Thomas Rast
2013-06-17 14:27               ` Junio C Hamano
2013-06-25 20:41                 ` Andrew Pimlott
2013-06-25 21:33                   ` Junio C Hamano
2013-06-25 23:17                     ` Andrew Pimlott
2013-06-25 21:36                   ` Junio C Hamano
2013-06-25 21:45                   ` Junio C Hamano
2013-06-25 22:01                     ` Junio C Hamano
2013-06-25 23:03                     ` Andrew Pimlott
2013-06-26 22:00                       ` Andrew Pimlott
2013-06-26 23:48                         ` Junio C Hamano
2013-06-27  0:20                           ` Andrew Pimlott
2013-06-27 19:26                             ` Andrew Pimlott
2013-06-27 20:52                               ` Junio C Hamano
2013-06-28 14:20                                 ` Andrew Pimlott

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=20130611180530.GA18488@oinkpad.pimlott.net \
    --to=andrew@pimlott.net \
    --cc=git@vger.kernel.org \
    /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

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).