From: Dennis Kaarsemaker <dennis@kaarsemaker.net>
To: Ralf Thielow <ralf.thielow@gmail.com>, git@vger.kernel.org
Cc: gitster@pobox.com
Subject: Re: [PATCH v2] rebase -i: improve advice on bad instruction lines
Date: Wed, 07 Sep 2016 11:28:11 +0200 [thread overview]
Message-ID: <1473240491.20551.1.camel@kaarsemaker.net> (raw)
In-Reply-To: <20160906185918.21286-1-ralf.thielow@gmail.com>
Hi Ralf,
There are quite a few patch series in flight these days around
interactive rebase. Have you checked for conflicts with those?
On di, 2016-09-06 at 20:59 +0200, Ralf Thielow wrote:
> If we found bad instruction lines in the instruction sheet
> of interactive rebase, we give the user advice on how to
> fix it. However, we don't tell the user what to do afterwards.
> Give the user advice to run 'git rebase --continue' after
> the fix.
>
> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
> ---
> Changes in v2:
> - adjust tests
>
> git-rebase--interactive.sh | 2 +-
> t/t3404-rebase-interactive.sh | 6 +++---
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
> index b1ba21c..029594e 100644
> --- a/git-rebase--interactive.sh
> +++ b/git-rebase--interactive.sh
> @@ -1041,7 +1041,7 @@ The possible behaviours are: ignore, warn,
> error.")"
> # placed before the commit of the next action
> checkout_onto
>
> - warn "$(gettext "You can fix this with 'git rebase
> --edit-todo'.")"
> + warn "$(gettext "You can fix this with 'git rebase
> --edit-todo' and then run 'git rebase --continue'.")"
> die "$(gettext "Or you can abort the rebase with
> 'git rebase --abort'.")"
> fi
> }
> diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-
> interactive.sh
> index 597e94e..e38e296 100755
> --- a/t/t3404-rebase-interactive.sh
> +++ b/t/t3404-rebase-interactive.sh
> @@ -1195,7 +1195,7 @@ To avoid this message, use "drop" to explicitly
> remove a commit.
> Use 'git config rebase.missingCommitsCheck' to change the level of
> warnings.
> The possible behaviours are: ignore, warn, error.
>
> -You can fix this with 'git rebase --edit-todo'.
> +You can fix this with 'git rebase --edit-todo' and then run 'git
> rebase --continue'.
> Or you can abort the rebase with 'git rebase --abort'.
> EOF
>
> @@ -1219,7 +1219,7 @@ cat >expect <<EOF
> Warning: the command isn't recognized in the following line:
> - badcmd $(git rev-list --oneline -1 master~1)
>
> -You can fix this with 'git rebase --edit-todo'.
> +You can fix this with 'git rebase --edit-todo' and then run 'git
> rebase --continue'.
> Or you can abort the rebase with 'git rebase --abort'.
> EOF
>
> @@ -1254,7 +1254,7 @@ cat >expect <<EOF
> Warning: the SHA-1 is missing or isn't a commit in the following
> line:
> - edit XXXXXXX False commit
>
> -You can fix this with 'git rebase --edit-todo'.
> +You can fix this with 'git rebase --edit-todo' and then run 'git
> rebase --continue'.
> Or you can abort the rebase with 'git rebase --abort'.
> EOF
>
next prev parent reply other threads:[~2016-09-07 9:28 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-06 18:08 [PATCH] rebase -i: improve advice on bad instruction lines Ralf Thielow
2016-09-06 18:50 ` Ralf Thielow
2016-09-06 18:59 ` [PATCH v2] " Ralf Thielow
2016-09-07 9:28 ` Dennis Kaarsemaker [this message]
2016-09-07 17:07 ` Ralf Thielow
2016-09-09 12:21 ` Johannes Schindelin
2016-09-07 18:58 ` Junio C Hamano
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=1473240491.20551.1.camel@kaarsemaker.net \
--to=dennis@kaarsemaker.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=ralf.thielow@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).