On Sun, Jul 5, 2015 at 11:38 PM, Johannes Schindelin <johannes.schinde...@gmx.de> wrote: > 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?
But "git rm -f" would fail if the file is not in the index, no? (Which could happen if the git-reset or git-checkout fails) Anyway, the purpose of the "rm -f" is to remove the dirtyfile, and not to clean up the index (we would use git reset --hard for that). (But yeah, I see that Junio noticed correctly that it should not be a rm -fr, but a rm -f instead.) Thanks, Paul -- 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
