diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-12-16 22:08:32 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-12-16 22:08:32 +0100 |
| commit | 71a7de7a99a3199a9ea0660287bd4c1747f4d3b6 (patch) | |
| tree | 1b8efa2809270ee2131954f26f3d6850ed19868d /builtin/rebase.c | |
| parent | Merge branch 'dl/test-cleanup' (diff) | |
| parent | rebase: fix format.useAutoBase breakage (diff) | |
| download | git-71a7de7a99a3199a9ea0660287bd4c1747f4d3b6.tar.xz git-71a7de7a99a3199a9ea0660287bd4c1747f4d3b6.zip | |
Merge branch 'dl/rebase-with-autobase'
"git rebase" did not work well when format.useAutoBase
configuration variable is set, which has been corrected.
* dl/rebase-with-autobase:
rebase: fix format.useAutoBase breakage
format-patch: teach --no-base
t4014: use test_config()
format-patch: fix indentation
t3400: demonstrate failure with format.useAutoBase
Diffstat (limited to 'builtin/rebase.c')
| -rw-r--r-- | builtin/rebase.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c index f82fe10878..ddf33bc9d4 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -1039,7 +1039,8 @@ static int run_am(struct rebase_options *opts) argv_array_pushl(&format_patch.args, "format-patch", "-k", "--stdout", "--full-index", "--cherry-pick", "--right-only", "--src-prefix=a/", "--dst-prefix=b/", "--no-renames", - "--no-cover-letter", "--pretty=mboxrd", "--topo-order", NULL); + "--no-cover-letter", "--pretty=mboxrd", "--topo-order", + "--no-base", NULL); if (opts->git_format_patch_opt.len) argv_array_split(&format_patch.args, opts->git_format_patch_opt.buf); |