Re: [PATCH v2 2/7] add tests for rebasing with patch-equivalence present
- From
Johannes Sixt <j.sixt@viscovery.net>
- Date
- May 29, 2013, 07:09 UTC
- Message-ID
- <51A5A992.306@viscovery.net>
- In-Reply-To
- <1369809572-24431-3-git-send-email-martinvonz@gmail.com>
Am 5/29/2013 8:39, schrieb Martin von Zweigbergk:
Show 5 quoted lines
> +# f > +# / > +# a---b---c---g---h > +# \ > +# d---G---i
...
Show 8 quoted lines
> +test_run_rebase () {
> + result=$1
> + shift
> + test_expect_$result "rebase $* --onto drops patches in onto" "
> + reset_rebase &&
> + git rebase $* --onto h f i &&
> + test_cmp_rev h HEAD~2 &&
> + test_linear_range 'd i' h..Isn't this expectation wrong? The upstream of the rebased branch is f, and it does not contain G. Hence, G should be replayed. Since h is the reversal of g, the state at h is the same as at c, and applying G should succeed (it is the same change as g). Therefore, I think the correct expectation is:
test_linear_range 'd G i' h..
Show 6 quoted lines
> + " > +} > +test_run_rebase failure '' > +test_run_rebase failure -m > +test_run_rebase failure -i > +test_run_rebase failure -p
-- Hannes