From: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>
Subject: [PATCH v2 0/1] Deprecate git rebase --preserve-merges
Date: Mon, 11 Mar 2019 12:57:35 -0700 (PDT) [thread overview]
Message-ID: <pull.158.v2.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.158.git.gitgitgadget@gmail.com>
It had a good run, but its design was irreparably limited. So I came up with
a redesign:--rebase-merges. It seems to work all right, so now it is time to
start letting go of the previous design.
Changes since v1:
* The term --rebase-merges is now marked as such in the deprecation notice
in git rebase's manual.
* The deprecation warning is now printed only in builtin/rebase.c, not
repeated in git-rebase--preserve-merges.sh.
Johannes Schindelin (1):
rebase: deprecate --preserve-merges
Documentation/config/branch.txt | 6 +++---
Documentation/config/pull.txt | 6 +++---
Documentation/git-rebase.txt | 23 ++++++++++++-----------
builtin/rebase.c | 8 ++++++--
4 files changed, 24 insertions(+), 19 deletions(-)
base-commit: e902e9bcae2010bc42648c80ab6adc6c5a16a4a5
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-158%2Fdscho%2Fdeprecate-rebase-p-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-158/dscho/deprecate-rebase-p-v2
Pull-Request: https://github.com/gitgitgadget/git/pull/158
Range-diff vs v1:
1: 6407430da7 ! 1: f6990f28c0 rebase: deprecate --preserve-merges
@@ -65,7 +65,7 @@
- Recreate merge commits instead of flattening the history by replaying
- commits a merge commit introduces. Merge conflict resolutions or manual
- amendments to merge commits are not preserved.
-+ [DEPRECATED: use --rebase-merges instead] Recreate merge commits
++ [DEPRECATED: use `--rebase-merges` instead] Recreate merge commits
+ instead of flattening the history by replaying commits a merge commit
+ introduces. Merge conflict resolutions or manual amendments to merge
+ commits are not preserved.
@@ -109,22 +109,9 @@
builtin_rebase_options);
+ if (options.type == REBASE_PRESERVE_MERGES)
-+ warning(_("--preserve-merges is deprecated in favor of "
-+ "--rebase-merges"));
++ warning(_("git rebase --preserve-merges is deprecated. "
++ "Use --rebase-merges instead."));
+
if (action != NO_ACTION && !in_progress)
die(_("No rebase in progress?"));
setenv(GIT_REFLOG_ACTION_ENVIRONMENT, "rebase", 0);
-
- diff --git a/git-rebase--preserve-merges.sh b/git-rebase--preserve-merges.sh
- --- a/git-rebase--preserve-merges.sh
- +++ b/git-rebase--preserve-merges.sh
-@@
- printf '%s\n' "$*" >&2
- }
-
-+warn "git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
-+
- # Output the commit message for the specified commit.
- commit_message () {
- git cat-file commit "$1" | sed "1,/^$/d"
--
gitgitgadget
next prev parent reply other threads:[~2019-03-11 19:57 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-07 10:00 [PATCH 0/1] Deprecate git rebase --preserve-merges Johannes Schindelin via GitGitGadget
2019-03-07 10:00 ` [PATCH 1/1] rebase: deprecate --preserve-merges Johannes Schindelin via GitGitGadget
2019-03-07 16:25 ` Phillip Wood
2019-03-11 19:31 ` Johannes Schindelin
2019-03-07 16:47 ` Eric Sunshine
2019-03-11 19:33 ` Johannes Schindelin
2019-03-11 19:57 ` Johannes Schindelin via GitGitGadget [this message]
2019-03-11 19:57 ` [PATCH v2 " Johannes Schindelin via GitGitGadget
2019-05-02 14:52 ` Ævar Arnfjörð Bjarmason
2019-05-09 14: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=pull.158.v2.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).