Felipe Contreras wrote:
> diff --git a/t/t3420-rebase-autostash.sh b/t/t3420-rebase-autostash.sh
> index a5e69f3..ff370a3 100755
> --- a/t/t3420-rebase-autostash.sh
> +++ b/t/t3420-rebase-autostash.sh
> @@ -71,8 +71,7 @@ testrebase() {
> test_must_fail git rebase$type related-onto-branch &&
> test_path_is_file $dotest/autostash &&
> ! grep dirty file3 &&
> - rm -rf $dotest &&
> - git reset --hard &&
> + git rebase --abort &&
> git checkout feature-branch
> '
Incorrect. I don't assume that --abort works yet, in this test. It
is non-trivial to get --abort to work with autostash, and this is
tested in a separate test: see "rebase$type: --abort" in the same
file.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html