From: Junio C Hamano <gitster@pobox.com>
To: Johannes Altmanninger <aclopte@gmail.com>
Cc: Erik Cervin Edin <erik@cervined.in>, git@vger.kernel.org
Subject: Re: [PATCH v2] sequencer: avoid dropping fixup commit that targets self via commit-ish
Date: Wed, 21 Sep 2022 11:47:26 -0700 [thread overview]
Message-ID: <xmqqa66s36pt.fsf@gitster.g> (raw)
In-Reply-To: <20220920031140.1220220-1-aclopte@gmail.com> (Johannes Altmanninger's message of "Mon, 19 Sep 2022 22:11:40 -0500")
Johannes Altmanninger <aclopte@gmail.com> writes:
> +test_expect_success 'auto squash that matches regex' '
> + git reset --hard base &&
> + git commit --allow-empty -m "hay needle hay" &&
> + git commit --allow-empty -m "fixup! :/needle" &&
> + GIT_SEQUENCE_EDITOR="cat >tmp" git rebase --autosquash -i HEAD^^ &&
> + sed -ne "/^[^#]/{s/[0-9a-f]\{7,\}/HASH/g;p;}" tmp >actual &&
> + cat <<-EOF >expect &&
> + pick HASH hay needle hay # empty
> + fixup HASH fixup! :/needle # empty
> + EOF
> + test_cmp expect actual
> +'
hint: Waiting for your editor to close the file...
Successfully rebased and updated refs/heads/main.
--- expect 2022-09-21 18:45:27.617530848 +0000
+++ actual 2022-09-21 18:45:27.613530478 +0000
@@ -1,2 +1,2 @@
pick HASH hay needle hay # empty
-fixup HASH fixup! :/needle # empty
+pick HASH fixup! :/needle # empty
not ok 11 - auto squash that matches regex
That does not look very good X-<.
next prev parent reply other threads:[~2022-09-21 18:48 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-17 14:45 [BUG] fixup commit is dropped during rebase if subject = branch name Erik Cervin Edin
2022-09-17 18:04 ` Junio C Hamano
2022-09-18 14:55 ` Erik Cervin Edin
2022-09-17 23:19 ` Johannes Altmanninger
2022-09-18 12:10 ` [PATCH] sequencer: avoid dropping fixup commit that targets self via commit-ish Johannes Altmanninger
2022-09-18 15:05 ` Erik Cervin Edin
2022-09-18 17:54 ` Johannes Altmanninger
2022-09-19 1:11 ` Junio C Hamano
2022-09-19 16:07 ` Junio C Hamano
2022-09-20 3:20 ` Johannes Altmanninger
2022-09-19 16:23 ` Junio C Hamano
2022-09-20 3:11 ` [PATCH v2] " Johannes Altmanninger
2022-09-20 8:26 ` Phillip Wood
2022-09-21 18:47 ` Junio C Hamano [this message]
2022-09-22 4:00 ` Johannes Altmanninger
2022-09-22 19:32 ` Junio C Hamano
2022-09-24 22:29 ` [PATCH v3] " Johannes Altmanninger
2022-09-19 23:09 ` [PATCH] " Junio C Hamano
2022-09-20 3:27 ` Johannes Altmanninger
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=xmqqa66s36pt.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=aclopte@gmail.com \
--cc=erik@cervined.in \
--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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).