pr-1466/newren/rebase-update-refs-imply-merge-v3
tagged this
21 Jan 01:55
…ompatibilities We had a report about --update-refs being ignored when --whitespace=fix was passed, confusing an end user. These were already marked as incompatible in the manual, but the code didn't check for the incompatibility and provide an error to the user. Folks brought up other flags tangentially when reviewing an earlier round of this series, and I found we had more that were missing checks, and that we were missing some testcases, and that the documentation was wrong on some of the relevant options. So, I ended up getting lots of little fixes to straighten these all out. Left out of this series: * If an option like rebase.autosquash or rebase.updateRefs are selected and the user specifies e.g. --whitespace=fix, we should either (a) tailor the error message better to point out that it's a config option that is incompatible with their command line flag, or (b) implement --whitespace=fix for the merge backend so we can just deprecate and eventually remove the apply backend[1]. [1] See "longer term goal" at https://lore.kernel.org/git/xmqqa78d2qmk.fsf@gitster-ct.c.googlers.com/ Changes since v2: * Remove the extra patch and reword the comment in t3422 more thoroughly. * Add tests for other flag incompatibilities that were missing * Add code that was missing for checking various flag incompatibilities * Fix incorrect claims in the documentation around incompatible options * A few other miscellaneous fixups noticed while doing all the above Changes since v1: * Add a patch nuking the -C option to rebase (fixes confusion around the comment in t3422 and acknowledges the fact that the option is totally and utterly useless and always has been. It literally never affects the results of a rebase.) Signed-off-by: Elijah Newren newren@gmail.com Elijah Newren (7): rebase: mark --update-refs as requiring the merge backend rebase: flag --apply and --merge as incompatible rebase: remove --allow-empty-message from incompatible opts rebase: fix docs about incompatibilities with --root rebase: add coverage of other incompatible options rebase: clarify the OPT_CMDMODE incompatibilities rebase: fix formatting of rebase --reapply-cherry-picks option in docs Documentation/git-rebase.txt | 73 +++++++++++++------------- builtin/rebase.c | 36 +++++++++---- t/t3422-rebase-incompatible-options.sh | 42 +++++++++++++-- 3 files changed, 101 insertions(+), 50 deletions(-) base-commit: 221222b278e713054e65cbbbcb2b1ac85483ea89 Submitted-As: https://lore.kernel.org/git/pull.1466.v3.git.1674266126.gitgitgadget@gmail.com In-Reply-To: https://lore.kernel.org/git/pull.1466.git.1674106587550.gitgitgadget@gmail.com In-Reply-To: https://lore.kernel.org/git/pull.1466.v2.git.1674190573.gitgitgadget@gmail.com
Assets 2
-
2023-01-21T01:55:26Z -
2023-01-21T01:55:26Z - Loading