From: Eric Sunshine <sunshine@sunshineco.com>
To: Johannes Schindelin <johannes.schindelin@gmx.de>
Cc: Git List <git@vger.kernel.org>, Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH 1/3] rebase -i: demonstrate bug with fixup!/squash! commit messages
Date: Fri, 20 Apr 2018 15:31:11 -0400 [thread overview]
Message-ID: <CAPig+cRO2+NJ0-DiuHXA=mWjPnivqH3PiwM9R6OGj2Rr3eLauA@mail.gmail.com> (raw)
In-Reply-To: <CAPig+cSb33EG2nATjCem4-2dp87SKOXm_SCWU=fCXJCBRZzgeg@mail.gmail.com>
On Fri, Apr 20, 2018 at 3:29 PM, Eric Sunshine <sunshine@sunshineco.com> wrote:
> On Fri, Apr 20, 2018 at 8:17 AM, Johannes Schindelin
> <johannes.schindelin@gmx.de> wrote:
>> + test_must_fail env FAKE_LINES="1 fixup 2 fixup 4" \
>> + git rebase -i HEAD~4 &&
>> +
>> + : now there is a conflict, and comments in the commit message &&
>> + git show HEAD >out &&
>> + grep "This is a combination of" out &&
>> +
>> + : skip and continue &&
>> + git rebase --skip &&
>
> I see that this test script doesn't utilize it, but do you want a
>
> test_when_finished "reset_rebase" &&
>
> before starting the rebase to clean up in case something before "git
> rebase --skip" fails?
Stated less ambiguously:
... in case something fails between "git rebase -i ..."
and "git rebase --skip"?
next prev parent reply other threads:[~2018-04-20 19:31 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-20 12:17 [PATCH 0/3] rebase -i: avoid stale "# This is a combination of" in commit messages Johannes Schindelin
2018-04-20 12:17 ` [PATCH 1/3] rebase -i: demonstrate bug with fixup!/squash! " Johannes Schindelin
2018-04-20 16:40 ` Stefan Beller
2018-04-20 20:04 ` Johannes Schindelin
2018-04-20 20:38 ` Johannes Schindelin
2018-04-20 20:44 ` Stefan Beller
2018-04-20 21:05 ` Johannes Schindelin
2018-04-20 19:29 ` Eric Sunshine
2018-04-20 19:31 ` Eric Sunshine [this message]
2018-04-20 20:52 ` Johannes Schindelin
2018-04-20 12:18 ` [PATCH 2/3] sequencer: leave a tell-tale when a fixup/squash failed Johannes Schindelin
2018-04-20 19:34 ` Eric Sunshine
2018-04-20 12:18 ` [PATCH 3/3] rebase --skip: clean up commit message after a failed fixup/squash Johannes Schindelin
2018-04-21 15:42 ` [PATCH 3/3] rebase --skip: clean up commit message after a failedfixup/squash Phillip Wood
2018-04-27 21:36 ` Johannes Schindelin
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='CAPig+cRO2+NJ0-DiuHXA=mWjPnivqH3PiwM9R6OGj2Rr3eLauA@mail.gmail.com' \
--to=sunshine@sunshineco.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johannes.schindelin@gmx.de \
/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).