From: Thomas Rast <trast@inf•ethz.ch>
To: Andrew Pimlott <andrew@pimlott•net>
Cc: <git@vger•kernel.org>
Subject: Re: rebase --autosquash does not handle fixup! of fixup!
Date: Tue, 11 Jun 2013 20:50:07 +0200 [thread overview]
Message-ID: <87obbc8otc.fsf@hexa.v.cablecom.net> (raw)
In-Reply-To: <20130611180530.GA18488@oinkpad.pimlott.net> (Andrew Pimlott's message of "Tue, 11 Jun 2013 11:05:30 -0700")
Andrew Pimlott <andrew@pimlott•net> writes:
> 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?
Sure, why not. You could start with something like the patch below
(untested). If that happens to work, just add a test and a good commit
message.
diff --git i/git-rebase--interactive.sh w/git-rebase--interactive.sh
index f953d8d..798ae81 100644
--- i/git-rebase--interactive.sh
+++ w/git-rebase--interactive.sh
@@ -689,7 +689,17 @@ rearrange_squash () {
case "$message" in
"squash! "*|"fixup! "*)
action="${message%%!*}"
- rest="${message#*! }"
+ rest=$message
+ while : ; do
+ case "$rest" in
+ "squash! "*|"fixup! "*)
+ rest="${rest#*! }"
+ ;;
+ *)
+ break
+ ;;
+ esac
+ done
echo "$sha1 $action $rest"
# if it's a single word, try to resolve to a full sha1 and
# emit a second copy. This allows us to match on both message
--
Thomas Rast
trast@{inf,student}.ethz.ch
next prev parent reply other threads:[~2013-06-11 18:50 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-11 18:05 rebase --autosquash does not handle fixup! of fixup! Andrew Pimlott
2013-06-11 18:50 ` Thomas Rast [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87obbc8otc.fsf@hexa.v.cablecom.net \
--to=trast@inf$(echo .)ethz.ch \
--cc=andrew@pimlott$(echo .)net \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox