diff options
| author | Taylor Blau <me@ttaylorr.com> | 2022-10-30 21:04:42 -0400 |
|---|---|---|
| committer | Taylor Blau <me@ttaylorr.com> | 2022-10-30 21:04:42 -0400 |
| commit | 003f815dd9f42b1bb893338b32d9cce33a8926c1 (patch) | |
| tree | 2d714cef7cf638a389124bfa75e526bed7697cb9 /t/t3431-rebase-fork-point.sh | |
| parent | e5be3c632af4ea1ec6d9406d30f7f8cf54f5e9e7 (diff) | |
| parent | aa1df8146d70bb85c63b0999868fe29aebc1173e (diff) | |
| download | git-003f815dd9f42b1bb893338b32d9cce33a8926c1.tar.gz | |
Merge branch 'pw/rebase-keep-base-fixes'
"git rebase --keep-base" used to discard the commits that are
already cherry-picked to the upstream, even when "keep-base" meant
that the base, on top of which the history is being rebuilt, does
not yet include these cherry-picked commits. The --keep-base
option now implies --reapply-cherry-picks and --no-fork-point
options.
* pw/rebase-keep-base-fixes:
rebase --keep-base: imply --no-fork-point
rebase --keep-base: imply --reapply-cherry-picks
rebase: factor out branch_base calculation
rebase: rename merge_base to branch_base
rebase: store orig_head as a commit
rebase: be stricter when reading state files containing oids
t3416: set $EDITOR in subshell
t3416: tighten two tests
Diffstat (limited to 't/t3431-rebase-fork-point.sh')
| -rwxr-xr-x | t/t3431-rebase-fork-point.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3431-rebase-fork-point.sh b/t/t3431-rebase-fork-point.sh index 1d0b15380e..70e8136356 100755 --- a/t/t3431-rebase-fork-point.sh +++ b/t/t3431-rebase-fork-point.sh @@ -50,7 +50,7 @@ test_rebase () { test_rebase 'G F E D B A' test_rebase 'G F D B A' --onto D -test_rebase 'G F B A' --keep-base +test_rebase 'G F C B A' --keep-base test_rebase 'G F C E D B A' --no-fork-point test_rebase 'G F C D B A' --no-fork-point --onto D test_rebase 'G F C B A' --no-fork-point --keep-base |