Ramkumar Ramachandra <[email protected]> writes:
> The following command
>
> $ git checkout -
>
> does not work as expected after a rebase. Every kind of rebase must
> behave in the exactly same way: for the purposes of checkout -, the
> rebase event should be inconsequential.
>
> Add two failing tests documenting this bug: one for a normal rebase, and
> another for an interactive rebase.
Why two?
After the discussion, I would have expected to see the two argument
form:
git rebase [-i] master other
started on the 'other' branch and also started on a branch that is
not 'master' or 'other', also be tested to specify the desired
behaviour in these cases.
>
> Signed-off-by: Ramkumar Ramachandra <[email protected]>
> ---
> t/t2012-checkout-last.sh | 16 ++++++++++++++++
> 1 file changed, 16 insertions(+)
>
> diff --git a/t/t2012-checkout-last.sh b/t/t2012-checkout-last.sh
> index b44de9d..ae6d319 100755
> --- a/t/t2012-checkout-last.sh
> +++ b/t/t2012-checkout-last.sh
> @@ -116,4 +116,20 @@ test_expect_success 'master...' '
> test "z$(git rev-parse --verify HEAD)" = "z$(git rev-parse --verify
> master^)"
> '
>
> +test_expect_failure '"checkout -" works after a rebase' '
> + git checkout master &&
> + git checkout other &&
> + git rebase master &&
> + git checkout - &&
> + test "z$(git symbolic-ref HEAD)" = "zrefs/heads/master"
> +'
> +
> +test_expect_failure '"checkout -" works after an interactive rebase' '
> + git checkout master &&
> + git checkout other &&
> + git rebase -i master &&
> + git checkout - &&
> + test "z$(git symbolic-ref HEAD)" = "zrefs/heads/master"
> +'
> +
> test_done
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
