Apparently, this use case has been broken for a long time... Since
bb52995f3e (format-patch: introduce format.useAutoBase configuration,
2016-04-26). I'm surprised it's only been reported now.
This patchset fixes the breakage by teaching
`git format-patch --no-base` and making rebase use it.
This patch is based on the latest master since it's such an old bug that
only got noticed recently, I'm not sure if it's worth fixing in 'maint'.
The series does not apply cleanly on top of 'maint' because it relies on
c1a6f21cd4 (Doc: add more detail for git-format-patch, 2019-08-27) but
the conflicts are relatively minor.
Changes since v2:
* Remove spurious indentation change
* Rebase onto the latest master
Changes since v1:
* Update some log messages
Denton Liu (5):
t3400: demonstrate failure with format.useAutoBase
format-patch: fix indentation
t4014: use test_config()
format-patch: teach --no-base
rebase: fix format.useAutoBase breakage
Documentation/git-format-patch.txt | 5 +++--
builtin/log.c | 24 +++++++++++++++++++++---
builtin/rebase.c | 3 ++-
t/t3400-rebase.sh | 6 ++++++
t/t4014-format-patch.sh | 14 +++++++++-----
5 files changed, 41 insertions(+), 11 deletions(-)
Range-diff against v2:
1: 4089e51041 = 1: 8d67bbe5bf t3400: demonstrate failure with format.useAutoBase
2: d288d6c3a5 = 2: 8cfde9f98e format-patch: fix indentation
3: 196b5d8dbc = 3: 638c4add00 t4014: use test_config()
4: f7e5325cc0 ! 4: 6cba51ca24 format-patch: teach --no-base
@@ builtin/log.c: int cmd_format_patch(int argc, const char **argv, const char *pre
+ N_("add prerequisite tree info to the patch series"),
+ 0, base_callback },
OPT_FILENAME(0, "signature-file", &signature_file,
-- N_("add a signature from a file")),
-+ N_("add a signature from a file")),
+ N_("add a signature from a file")),
OPT__QUIET(&quiet, N_("don't print the patch filenames")),
- OPT_BOOL(0, "progress", &show_progress,
- N_("show progress while generating patches")),
## t/t4014-format-patch.sh ##
@@ t/t4014-format-patch.sh: test_expect_success 'format-patch --base overrides format.useAutoBase' '
5: 62c59c12e3 = 5: eb266aaedc rebase: fix format.useAutoBase breakage
--
2.24.0.578.g4820254054
