From: Elijah Newren <newren@gmail.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com, phillip.wood@dunelm.org.uk,
johannes.schindelin@gmx.de, sunshine@sunshineco.com,
Elijah Newren <newren@gmail.com>
Subject: [PATCH v3 0/7] Document/fix/warn about rebase incompatibilities and inconsistencies
Date: Thu, 21 Jun 2018 08:00:16 -0700 [thread overview]
Message-ID: <20180621150023.23533-1-newren@gmail.com> (raw)
In-Reply-To: <20180617055856.22838-1-newren@gmail.com>
git-rebase has lots of options that are mutually incompatible. Even among
aspects of its behavior that is common to all rebase types, it has a number
of inconsistencies. This series tries to document, fix, and/or warn users
about many of these.
I have left patch 7 in RFC state. We probably need more opinions
about it, and whether cherry-pick should also be changed to match.
Changes since v2 (full branch-diff below):
- Slight changes to documentation wording
- Add incompatibilitiy of --rebase-merges and --strategy-option
- Add tests and code for incompatibilities involving either
--preserve-merges or --rebase-merges
- Slightly more detail in the commit message for making -m and -i behave
the same with empty commit messages as am-based rebases.
Many thanks to Phillip for reviewing the last series, and Eric who pointed
out the wording improvements.
Elijah Newren (7):
git-rebase.txt: document incompatible options
git-rebase.sh: update help messages a bit
t3422: new testcases for checking when incompatible options passed
git-rebase: error out when incompatible options passed
git-rebase.txt: document behavioral inconsistencies between modes
git-rebase.txt: address confusion between --no-ff vs --force-rebase
git-rebase: make --allow-empty-message the default
Documentation/git-rebase.txt | 155 ++++++++++++++++++++-----
git-rebase.sh | 42 ++++++-
t/t3404-rebase-interactive.sh | 7 +-
t/t3405-rebase-malformed.sh | 11 +-
t/t3422-rebase-incompatible-options.sh | 89 ++++++++++++++
5 files changed, 262 insertions(+), 42 deletions(-)
create mode 100755 t/t3422-rebase-incompatible-options.sh
1: d184d5bd3f ! 1: 4cdf9130cc git-rebase.txt: document incompatible options
@@ -191,14 +191,15 @@
+ * --keep-empty
+ * --autosquash
+ * --edit-todo
-+ * --root + --onto
++ * --root when used in combination with --onto
+
+Other incompatible flag pairs:
+
-+ * --preserve-merges && --interactive
-+ * --preserve-merges && --signoff
-+ * --preserve-merges && --rebase-merges
-+ * --rebase-merges && --strategy
++ * --preserve-merges and --interactive
++ * --preserve-merges and --signoff
++ * --preserve-merges and --rebase-merges
++ * --rebase-merges and --strategy
++ * --rebase-merges and --strategy-option
+
include::merge-strategies.txt[]
2: 788df9fa43 = 2: e336f76c5e git-rebase.sh: update help messages a bit
3: d3d124795a ! 3: 4ab38d8a5f t3422: new testcases for checking when incompatible options passed
@@ -83,4 +83,24 @@
+test_run_rebase --committer-date-is-author-date
+test_run_rebase -C4
+
++test_expect_success '--preserve-merges incompatible with --signoff' '
++ git checkout B^0 &&
++ test_must_fail git rebase --preserve-merges --signoff A
++'
++
++test_expect_failure '--preserve-merges incompatible with --rebase-merges' '
++ git checkout B^0 &&
++ test_must_fail git rebase --preserve-merges --rebase-merges A
++'
++
++test_expect_failure '--rebase-merges incompatible with --strategy' '
++ git checkout B^0 &&
++ test_must_fail git rebase --rebase-merges -s resolve A
++'
++
++test_expect_failure '--rebase-merges incompatible with --strategy-option' '
++ git checkout B^0 &&
++ test_must_fail git rebase --rebase-merges -Xignore-space-change A
++'
++
+test_done
4: 28d2dfd49a ! 4: 5223954caf git-rebase: error out when incompatible options passed
@@ -56,6 +56,30 @@
if test -n "$signoff"
then
test -n "$preserve_merges" &&
+@@
+ force_rebase=t
+ fi
+
++if test -n "$preserve_merges"
++then
++ # Note: incompatibility with --signoff handled in signoff block above
++ # Note: incompatibility with --interactive is just a strong warning;
++ # git-rebase.txt caveats with "unless you know what you are doing"
++ test -n "$rebase_merges" &&
++ die "$(gettext "error: cannot combine '--preserve_merges' with '--rebase-merges'")"
++fi
++
++if test -n "$rebase_merges"
++then
++ test -n "$strategy_opts" &&
++ die "$(gettext "error: cannot combine '--rebase_merges' with '--strategy-option'")"
++ test -n "$strategy" &&
++ die "$(gettext "error: cannot combine '--rebase_merges' with '--strategy'")"
++fi
++
+ if test -z "$rebase_root"
+ then
+ case "$#" in
diff --git a/t/t3422-rebase-incompatible-options.sh b/t/t3422-rebase-incompatible-options.sh
--- a/t/t3422-rebase-incompatible-options.sh
@@ -93,3 +117,24 @@
git checkout B^0 &&
test_must_fail git rebase $opt --exec 'true' A
"
+@@
+ test_must_fail git rebase --preserve-merges --signoff A
+ '
+
+-test_expect_failure '--preserve-merges incompatible with --rebase-merges' '
++test_expect_success '--preserve-merges incompatible with --rebase-merges' '
+ git checkout B^0 &&
+ test_must_fail git rebase --preserve-merges --rebase-merges A
+ '
+
+-test_expect_failure '--rebase-merges incompatible with --strategy' '
++test_expect_success '--rebase-merges incompatible with --strategy' '
+ git checkout B^0 &&
+ test_must_fail git rebase --rebase-merges -s resolve A
+ '
+
+-test_expect_failure '--rebase-merges incompatible with --strategy-option' '
++test_expect_success '--rebase-merges incompatible with --strategy-option' '
+ git checkout B^0 &&
+ test_must_fail git rebase --rebase-merges -Xignore-space-change A
+ '
5: b2eec2cc5a ! 5: 96f7ba98bc git-rebase.txt: document behavioral inconsistencies between modes
@@ -14,8 +14,8 @@
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@
- * --preserve-merges && --rebase-merges
- * --rebase-merges && --strategy
+ * --rebase-merges and --strategy
+ * --rebase-merges and --strategy-option
+BEHAVIORAL INCONSISTENCIES
+--------------------------
6: cea18d7e60 = 6: 7bb7b380ac git-rebase.txt: address confusion between --no-ff vs --force-rebase
7: ab8805c40a ! 7: 3ed07548a6 git-rebase: make --allow-empty-message the default
@@ -2,9 +2,13 @@
git-rebase: make --allow-empty-message the default
- am-based rebases already apply commits with an empty commit message
- without requiring the user to specify an extra flag. Make merge-based and
- interactive-based rebases behave the same.
+ All rebase backends should behave the same with empty commit messages, but
+ currently do not. am-based rebases already apply commits with an empty
+ commit message without stopping or requiring the user to specify an extra
+ flag. Since am-based rebases are the default rebase type, and since it
+ appears no one has ever requested a --no-allow-empty-message flag to
+ change this behavior, make --allow-empty-message the default so that
+ merge-based and interactive-based rebases will behave the same.
Signed-off-by: Elijah Newren <newren@gmail.com>
--
2.18.0.rc2.92.g133ed01dde
next prev parent reply other threads:[~2018-06-21 15:01 UTC|newest]
Thread overview: 130+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-07 4:58 RFC: rebase inconsistency in 2.18 -- course of action? Elijah Newren
2018-06-07 5:04 ` [PATCH] t3401: add directory rename testcases for rebase and am Elijah Newren
2018-06-25 16:17 ` Elijah Newren
2018-06-07 5:05 ` [PATCH] apply: fix grammar error in comment Elijah Newren
2018-06-07 5:05 ` [PATCH] t5407: fix test to cover intended arguments Elijah Newren
2018-06-07 5:06 ` [PATCH] git-rebase--merge: modernize "git-$cmd" to "git $cmd" Elijah Newren
2018-06-07 5:24 ` Elijah Newren
2018-06-27 7:46 ` [PATCH v2] " Elijah Newren
2018-07-12 15:49 ` Johannes Schindelin
2018-07-13 16:13 ` Elijah Newren
2018-07-14 22:20 ` Johannes Schindelin
2018-06-07 5:06 ` [PATCH 1/2] t3422: new testcases for checking when incompatible options passed Elijah Newren
2018-06-07 5:06 ` [PATCH 2/2] git-rebase: error out " Elijah Newren
2018-06-10 19:40 ` Phillip Wood
2018-06-11 15:19 ` Elijah Newren
2018-06-11 15:59 ` Phillip Wood
2018-06-11 15:49 ` Elijah Newren
2018-06-12 9:45 ` Phillip Wood
2018-06-17 5:58 ` [RFC PATCH v2 0/7] Document/fix/warn about rebase incompatibilities and inconsistences Elijah Newren
2018-06-17 5:58 ` [RFC PATCH v2 1/7] git-rebase.txt: document incompatible options Elijah Newren
2018-06-17 15:38 ` Phillip Wood
2018-06-20 17:09 ` Elijah Newren
2018-06-17 17:15 ` Eric Sunshine
2018-06-20 17:10 ` Elijah Newren
2018-06-17 5:58 ` [RFC PATCH v2 2/7] git-rebase.sh: update help messages a bit Elijah Newren
2018-06-17 5:58 ` [RFC PATCH v2 3/7] t3422: new testcases for checking when incompatible options passed Elijah Newren
2018-06-17 5:58 ` [RFC PATCH v2 4/7] git-rebase: error out " Elijah Newren
2018-06-17 5:58 ` [RFC PATCH v2 5/7] git-rebase.txt: document behavioral inconsistencies between modes Elijah Newren
2018-06-17 5:58 ` [RFC PATCH v2 6/7] git-rebase.txt: address confusion between --no-ff vs --force-rebase Elijah Newren
2018-06-17 5:58 ` [RFC PATCH v2 7/7] git-rebase: make --allow-empty-message the default Elijah Newren
2018-06-17 15:30 ` Phillip Wood
2018-06-20 16:47 ` Elijah Newren
2018-06-17 15:41 ` [RFC PATCH v2 0/7] Document/fix/warn about rebase incompatibilities and inconsistences Phillip Wood
2018-06-21 15:00 ` Elijah Newren [this message]
2018-06-21 15:00 ` [PATCH v3 1/7] git-rebase.txt: document incompatible options Elijah Newren
2018-06-21 19:47 ` Junio C Hamano
2018-06-21 20:33 ` Elijah Newren
2018-06-22 8:32 ` SZEDER Gábor
2018-06-21 15:00 ` [PATCH v3 2/7] git-rebase.sh: update help messages a bit Elijah Newren
2018-06-21 19:58 ` Junio C Hamano
2018-06-21 20:34 ` Elijah Newren
2018-06-21 15:00 ` [PATCH v3 3/7] t3422: new testcases for checking when incompatible options passed Elijah Newren
2018-06-21 20:04 ` Junio C Hamano
2018-06-21 20:37 ` Elijah Newren
2018-06-21 21:18 ` Eric Sunshine
2018-06-21 15:00 ` [PATCH v3 4/7] git-rebase: error out " Elijah Newren
2018-06-21 20:29 ` Junio C Hamano
2018-06-21 20:41 ` Elijah Newren
2018-06-21 15:00 ` [PATCH v3 5/7] git-rebase.txt: document behavioral inconsistencies between modes Elijah Newren
2018-06-21 20:44 ` Junio C Hamano
2018-06-21 21:25 ` Elijah Newren
2018-06-21 15:00 ` [PATCH v3 6/7] git-rebase.txt: address confusion between --no-ff vs --force-rebase Elijah Newren
2018-06-21 20:46 ` Junio C Hamano
2018-06-21 21:22 ` Elijah Newren
2018-06-21 15:00 ` [RFC PATCH v3 7/7] git-rebase: make --allow-empty-message the default Elijah Newren
2018-06-25 16:12 ` [PATCH v4 0/9] Document/fix/warn about rebase incompatibilities and inconsistencies Elijah Newren
2018-06-25 16:12 ` [PATCH v4 1/9] git-rebase.txt: document incompatible options Elijah Newren
2018-06-25 16:12 ` [PATCH v4 2/9] git-rebase.sh: update help messages a bit Elijah Newren
2018-06-25 16:12 ` [PATCH v4 3/9] t3422: new testcases for checking when incompatible options passed Elijah Newren
2018-06-26 18:17 ` Junio C Hamano
2018-06-27 6:50 ` Elijah Newren
2018-06-25 16:12 ` [PATCH v4 4/9] git-rebase: error out " Elijah Newren
2018-06-25 16:12 ` [PATCH v4 5/9] git-rebase.txt: address confusion between --no-ff vs --force-rebase Elijah Newren
2018-06-25 16:12 ` [PATCH v4 6/9] directory-rename-detection.txt: technical docs on abilities and limitations Elijah Newren
2018-06-25 16:12 ` [PATCH v4 7/9] git-rebase.txt: document behavioral differences between modes Elijah Newren
2018-06-25 16:12 ` [PATCH v4 8/9] t3401: add directory rename testcases for rebase and am Elijah Newren
2018-06-25 16:13 ` [RFC PATCH v4 9/9] git-rebase: make --allow-empty-message the default Elijah Newren
2018-06-27 7:23 ` [PATCH v5 0/9] Document/fix/warn about rebase incompatibilities and inconsistencies Elijah Newren
2018-06-27 7:23 ` [PATCH v5 1/9] git-rebase.txt: document incompatible options Elijah Newren
2018-06-27 7:23 ` [PATCH v5 2/9] git-rebase.sh: update help messages a bit Elijah Newren
2018-06-27 7:23 ` [PATCH v5 3/9] t3422: new testcases for checking when incompatible options passed Elijah Newren
2018-06-27 7:23 ` [PATCH v5 4/9] git-rebase: error out " Elijah Newren
2018-06-27 7:23 ` [PATCH v5 5/9] git-rebase.txt: address confusion between --no-ff vs --force-rebase Elijah Newren
2018-06-27 7:23 ` [PATCH v5 6/9] directory-rename-detection.txt: technical docs on abilities and limitations Elijah Newren
2018-06-27 7:23 ` [PATCH v5 7/9] git-rebase.txt: document behavioral differences between modes Elijah Newren
2018-06-27 7:23 ` [PATCH v5 8/9] t3401: add directory rename testcases for rebase and am Elijah Newren
2018-06-27 7:23 ` [RFC PATCH v5 9/9] git-rebase: make --allow-empty-message the default Elijah Newren
2018-09-12 2:42 ` 2.19.0 regression: leaving editor with empty commit message doesn't stop rebase [was: Re: [RFC PATCH v5 9/9] git-rebase: make --allow-empty-message the default] SZEDER Gábor
2018-09-12 6:21 ` Elijah Newren
2018-09-12 21:18 ` [PATCH] sequencer: fix --allow-empty-message behavior, make it smarter Elijah Newren
2018-09-13 20:24 ` Junio C Hamano
2018-06-29 13:20 ` [PATCH v5 0/9] Document/fix/warn about rebase incompatibilities and inconsistencies Phillip Wood
2018-06-07 5:07 ` [PATCH] git-rebase.sh: handle keep-empty like all other options Elijah Newren
2018-06-10 19:26 ` Phillip Wood
2018-06-11 14:42 ` Elijah Newren
2018-06-11 15:16 ` Phillip Wood
2018-06-11 16:08 ` Elijah Newren
2018-06-12 9:53 ` Phillip Wood
2018-06-07 5:08 ` [PATCH 1/2] t3418: add testcase showing problems with rebase -i and strategy options Elijah Newren
2018-06-07 5:08 ` [PATCH 2/2] Fix use of strategy options with interactive rebases Elijah Newren
2018-06-27 7:36 ` [PATCH v2 0/2] " Elijah Newren
2018-06-27 7:36 ` [PATCH v2 1/2] t3418: add testcase showing problems with rebase -i and strategy options Elijah Newren
2018-06-27 7:45 ` Eric Sunshine
2018-06-27 7:49 ` Elijah Newren
2018-06-27 16:54 ` Junio C Hamano
2018-06-27 17:27 ` Elijah Newren
2018-06-27 18:17 ` Johannes Sixt
2018-06-27 18:24 ` Eric Sunshine
2018-06-27 18:34 ` [PATCH v2 1/2] t3418: add testcase showing problems with rebase SZEDER Gábor
2018-06-27 19:20 ` [PATCH v2 1/2] t3418: add testcase showing problems with rebase -i and strategy options Junio C Hamano
2018-06-27 19:23 ` Junio C Hamano
2018-06-27 7:36 ` [PATCH v2 2/2] Fix use of strategy options with interactive rebases Elijah Newren
2018-06-27 15:48 ` [PATCH v3 0/2] " Elijah Newren
2018-06-27 15:48 ` [PATCH v3 1/2] t3418: add testcase showing problems with rebase -i and strategy options Elijah Newren
2018-06-27 18:28 ` SZEDER Gábor
2018-07-11 10:56 ` SZEDER Gábor
2018-07-11 19:12 ` Elijah Newren
2018-06-27 15:48 ` [PATCH v3 2/2] Fix use of strategy options with interactive rebases Elijah Newren
2018-07-12 15:41 ` Johannes Schindelin
2018-07-13 15:51 ` Elijah Newren
2018-06-07 17:13 ` [RFC PATCH 0/3] Send more rebases through interactive machinery Elijah Newren
2018-06-07 17:13 ` [RFC PATCH 1/3] git-rebase, sequencer: add a --quiet option for the " Elijah Newren
2018-06-09 21:45 ` Johannes Schindelin
2018-06-09 23:05 ` Elijah Newren
2018-06-07 17:13 ` [RFC PATCH 2/3] rebase: Implement --merge via git-rebase--interactive Elijah Newren
2018-06-09 22:04 ` Johannes Schindelin
2018-06-10 1:14 ` Elijah Newren
2018-06-11 9:54 ` Phillip Wood
2018-06-07 17:13 ` [RFC PATCH 3/3] git-rebase.sh: make git-rebase--interactive the default Elijah Newren
2018-06-09 22:11 ` Johannes Schindelin
2018-06-10 1:31 ` Elijah Newren
2018-06-17 21:44 ` Johannes Schindelin
2018-06-20 16:27 ` Elijah Newren
2018-06-21 10:57 ` Johannes Schindelin
2018-06-21 15:36 ` Elijah Newren
2019-01-21 15:55 ` Johannes Schindelin
2019-01-21 19:02 ` Elijah Newren
2019-01-22 15:37 ` Johannes Schindelin
2018-06-11 17:44 ` RFC: rebase inconsistency in 2.18 -- course of action? Junio C Hamano
2018-06-11 20:17 ` Elijah Newren
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=20180621150023.23533-1-newren@gmail.com \
--to=newren@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johannes.schindelin@gmx.de \
--cc=phillip.wood@dunelm.org.uk \
--cc=sunshine@sunshineco.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).