Thread (66 messages) 66 messages, 9 authors, 2022-10-19

Re: [PATCH v2 7/7] rebase --keep-base: imply --no-fork-point

From: Phillip Wood <hidden>
Date: 2022-09-08 13:21:27

Hi Denton

On 08/09/2022 03:44, Denton Liu wrote:
Hi Phillip,

Sorry I haven't been active in Git development lately. I've been busy
with other stuff. I was skimming my emails and this patch caught my eye.
Thanks for taking a look
On Wed, Sep 07, 2022 at 02:37:50PM +0000, Phillip Wood via GitGitGadget wrote:
quoted
diff --git a/t/t3431-rebase-fork-point.sh b/t/t3431-rebase-fork-point.sh
index 1d0b15380ed..70e81363569 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
We should add a test here for explicit --fork-point just to ensure that
the behaviour stays the same in case anyone relies on it here.
There is an existing test, it does not show up in the patch because it 
is unchanged.

Best Wishes

Phillip
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help