Skip to content

Update the die() preserve-merges messages to help some users #3708

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 22, 2022
Merged

Update the die() preserve-merges messages to help some users #3708

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99be4d8
rebase: help user when dying with preserve-merges`
PhilipOakley Feb 21, 2022
1c8a36f
rebase: `preserve` is also a pull option, tell dying users
PhilipOakley Feb 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions builtin/rebase.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1155,7 +1155,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
strbuf_reset(&buf);
strbuf_addf(&buf, "%s/rewritten", merge_dir());
if (is_directory(buf.buf)) {
die("`rebase -p` is no longer supported");
die("`rebase --preserve-merges` (-p) is no longer supported.\n"
"You still have a `.git/rebase-merge/rewritten` directory, \n"
"indicating a `rebase preserve-merge` is still in progress.\n");
} else {
strbuf_reset(&buf);
strbuf_addf(&buf, "%s/interactive", merge_dir());
Expand All @@ -1177,7 +1179,10 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
builtin_rebase_usage, 0);

if (preserve_merges_selected)
die(_("--preserve-merges was replaced by --rebase-merges"));
die(_("--preserve-merges was replaced by --rebase-merges\n"
"Also, check your `pull` configuration settings\n"
"`git config --show-scope --show-origin --get-regexp 'pull.*'`\n"
"which may also invoke this option."));

if (action != ACTION_NONE && total_argc != 2) {
usage_with_options(builtin_rebase_usage,
Expand Down