From: Junio C Hamano <gitster@pobox.com>
To: "SZEDER Gábor" <szeder.dev@gmail.com>
Cc: git@vger.kernel.org, Phillip Wood <phillip.wood@talktalk.net>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Elijah Newren <newren@gmail.com>,
Eric Sunshine <sunshine@sunshineco.com>, ch <cr@onlinehome.de>,
Phillip Wood <phillip.wood@dunelm.org.uk>
Subject: Re: [PATCH] t/lib-rebase.sh: support explicit 'pick' commands in 'fake_editor.sh'
Date: Thu, 23 Aug 2018 09:20:25 -0700 [thread overview]
Message-ID: <xmqq6001jbqu.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20180823100915.22855-1-szeder.dev@gmail.com> ("SZEDER Gábor"'s message of "Thu, 23 Aug 2018 12:09:15 +0200")
SZEDER Gábor <szeder.dev@gmail.com> writes:
> diff --git a/t/lib-rebase.sh b/t/lib-rebase.sh
> index 25a77ee5cb..592865d019 100644
> --- a/t/lib-rebase.sh
> +++ b/t/lib-rebase.sh
> @@ -47,7 +47,7 @@ set_fake_editor () {
> action=pick
> for line in $FAKE_LINES; do
> case $line in
> - squash|fixup|edit|reword|drop)
> + pick|squash|fixup|edit|reword|drop)
> action="$line";;
> exec*)
> echo "$line" | sed 's/_/ /g' >> "$1";;
There is a large comment before the function that says
...
# The following word combinations are possible:
#
# "<lineno>" -- add a "pick" line with the SHA1 taken from the
# specified line.
#
# "<cmd> <lineno>" -- add a line with the specified command
# ("squash", "fixup", "edit", "reword" or "drop") and the SHA1 taken
# from the specified line.
#
# "exec_cmd_with_args" -- add an "exec cmd with args" line.
...
which probably needs an update, too.
next prev parent reply other threads:[~2018-08-23 16:20 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-11 16:06 [BUG] git-rebase: reword squashes commits in case of merge-conflicts ch
2018-06-12 10:08 ` Jeff King
2018-06-15 14:35 ` ch
2018-06-16 16:08 ` Elijah Newren
2018-06-17 3:36 ` Eric Sunshine
2018-06-17 5:37 ` [PATCH v2] sequencer: do not squash 'reword' commits when we hit conflicts Elijah Newren
2018-06-17 15:04 ` Phillip Wood
2018-06-17 19:28 ` Johannes Schindelin
2018-06-18 10:20 ` Phillip Wood
2018-06-18 15:42 ` Junio C Hamano
2018-06-18 21:42 ` Johannes Schindelin
2018-06-19 10:00 ` [PATCH v2] sequencer: do not squash 'reword' commits when wehit conflicts Phillip Wood
2018-06-19 12:46 ` [PATCH v3] sequencer: do not squash 'reword' commits when we hit conflicts Phillip Wood
2018-06-19 14:29 ` Elijah Newren
2018-06-19 16:59 ` Junio C Hamano
2018-08-23 10:09 ` [PATCH] t/lib-rebase.sh: support explicit 'pick' commands in 'fake_editor.sh' SZEDER Gábor
2018-08-23 16:20 ` Junio C Hamano [this message]
2018-08-23 20:53 ` Johannes Schindelin
2018-06-17 18:46 ` [PATCH v2] sequencer: do not squash 'reword' commits when we hit conflicts 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=xmqq6001jbqu.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=cr@onlinehome.de \
--cc=git@vger.kernel.org \
--cc=newren@gmail.com \
--cc=phillip.wood@dunelm.org.uk \
--cc=phillip.wood@talktalk.net \
--cc=sunshine@sunshineco.com \
--cc=szeder.dev@gmail.com \
/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).