Hi Paul, On 2015-07-02 20:16, Paul Tan wrote:
> diff --git a/t/t4150-am.sh b/t/t4150-am.sh > index 3f54bdf..0a19136 100755 > --- a/t/t4150-am.sh > +++ b/t/t4150-am.sh > @@ -154,6 +154,17 @@ test_expect_success 'am applies patch correctly' ' > test "$(git rev-parse second^)" = "$(git rev-parse HEAD^)" > ' > > +test_expect_success 'am fails if index is dirty' ' > + test_when_finished "rm -fr dirtyfile" && Seeing as you `git add` that file further down, how about `git rm -f dirtfile` here? > + rm -fr .git/rebase-apply && > + git checkout -f first && > + echo dirtyfile >dirtyfile && > + git add dirtyfile && > + test_must_fail git am patch1 && > + test_path_is_dir .git/rebase-apply && > + test_cmp_rev first HEAD Ciao, Dscho -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
