From: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Vas Sudanagunta <vas@commonkarma.org>,
Junio C Hamano <gitster@pobox.com>
Subject: [PATCH v2 0/1] Make rebase.reschedulefailedexec less overzealous
Date: Mon, 01 Jul 2019 04:58:14 -0700 (PDT) [thread overview]
Message-ID: <pull.253.v2.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.253.git.gitgitgadget@gmail.com>
This config setting is pretty useful, but it unfortunately stops all
non-interactive rebases with a bogus error message. This patch fixes that.
Reported via a commit comment on GitHub
[https://github.com/git/git/commit/969de3ff0e0#commitcomment-33257187].
Changes since v1:
* Based on Junio's advice, the commit message was improved considerably.
* The error message now also mentions --exec, so that users do not have to
know that --exec implies the interactive backend.
Johannes Schindelin (1):
rebase --am: ignore rebase.reschedulefailedexec
builtin/rebase.c | 10 +++++++---
t/t3418-rebase-continue.sh | 8 ++++++++
2 files changed, 15 insertions(+), 3 deletions(-)
base-commit: e11ff8975bedc0aae82632c3cb72578c3d7fc0b2
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-253%2Fdscho%2Freschedule-failed-exec-gently-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-253/dscho/reschedule-failed-exec-gently-v2
Pull-Request: https://github.com/gitgitgadget/git/pull/253
Range-diff vs v1:
1: fab124da41 ! 1: beaeb24bc0 Let rebase.reschedulefailedexec only affect interactive rebases
@@ -1,9 +1,13 @@
Author: Johannes Schindelin <johannes.schindelin@gmx.de>
- Let rebase.reschedulefailedexec only affect interactive rebases
+ rebase --am: ignore rebase.reschedulefailedexec
- It does not make sense to stop non-interactive rebases when that config
- setting is set to `true`.
+ The `exec` command is specific to the interactive backend, therefore it
+ does not make sense for non-interactive rebases to heed that config
+ setting.
+
+ We still want to error out if a non-interactive rebase is started with
+ `--reschedule-failed-exec`, of course.
Reported by Vas Sudanagunta via:
https://github.com/git/git/commit/969de3ff0e0#commitcomment-33257187
@@ -35,8 +39,10 @@
}
- if (options.reschedule_failed_exec && !is_interactive(&options))
+- die(_("--reschedule-failed-exec requires an interactive rebase"));
+ if (reschedule_failed_exec > 0 && !is_interactive(&options))
- die(_("--reschedule-failed-exec requires an interactive rebase"));
++ die(_("--reschedule-failed-exec requires "
++ "--exec or --interactive"));
+ if (reschedule_failed_exec >= 0)
+ options.reschedule_failed_exec = reschedule_failed_exec;
--
gitgitgadget
next prev parent reply other threads:[~2019-07-01 11:58 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-27 8:12 [PATCH 0/1] Make rebase.reschedulefailedexec less overzealous Johannes Schindelin via GitGitGadget
2019-06-27 8:12 ` [PATCH 1/1] Let rebase.reschedulefailedexec only affect interactive rebases Johannes Schindelin via GitGitGadget
2019-06-27 18:32 ` Junio C Hamano
2019-06-28 11:49 ` Johannes Schindelin
2019-06-28 13:44 ` Phillip Wood
2019-06-28 22:08 ` Junio C Hamano
2019-06-28 23:52 ` Vas Sudanagunta
2019-06-30 10:03 ` Phillip Wood
2019-07-01 11:52 ` Johannes Schindelin
[not found] ` <0F745CE4-3203-4447-B1D5-937CCDCC64C7@commonkarma.org>
2019-07-01 11:48 ` Johannes Schindelin
2019-07-01 11:49 ` Johannes Schindelin
2019-07-01 11:58 ` Johannes Schindelin via GitGitGadget [this message]
2019-07-01 11:58 ` [PATCH v2 1/1] rebase --am: ignore rebase.reschedulefailedexec Johannes Schindelin via GitGitGadget
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=pull.253.v2.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=vas@commonkarma.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).