git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 02/12] t4150: am fails if index is dirty

From
Paul Tan <pyokagan@gmail.com>
Date
Jul 7, 2015, 06:35 UTC
Message-ID
<CACRoPnSTNxR4+NLX_f6FaOJPLj4k9ESaLrdwjfxhSZCZYHUOSw@mail.gmail.com>
In-Reply-To
<eb790f13314192dcf4787c54d4cd3cfb@www.dscho.org>

On Sun, Jul 5, 2015 at 11:38 PM, Johannes Schindelin <johannes.schindelin@gmx.de> wrote:

Show 14 quoted lines
> 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

Previous: Johannes SchindelinNext: Paul Tan
Message 7 of 26 in “Improve git-am test coverage”
  1. 00/12 Improve git-am test coveragePaul Tan, Jul 2, 2015
  2. 01/12 t4150: am.messageid really adds the message idPaul Tan, Jul 2, 2015
  3. Paolo BonziniJul 2, 2015
  4. Junio C HamanoJul 6, 2015
  5. 02/12 t4150: am fails if index is dirtyPaul Tan, Jul 2, 2015
  6. Johannes SchindelinJul 5, 2015
  7. Paul TanJul 7, 2015
  8. 03/12 t4151: am --abort will keep dirty index intactPaul Tan, Jul 2, 2015
  9. 04/12 t4150: am refuses patches when pausedPaul Tan, Jul 2, 2015
  10. 05/12 t4150: am --resolved fails if index has no changesPaul Tan, Jul 2, 2015
  11. 06/12 t4150: am --resolved fails if index has unmerged entriesPaul Tan, Jul 2, 2015
  12. 07/12 t4150: am with applypatch-msg hookPaul Tan, Jul 2, 2015
  13. Junio C HamanoJul 6, 2015
  14. 08/12 t4150: am with pre-applypatch hookPaul Tan, Jul 2, 2015
  15. 09/12 t4150: am with post-applypatch hookPaul Tan, Jul 2, 2015
  16. Johannes SchindelinJul 5, 2015
  17. Paul TanJul 7, 2015
  18. Johannes SchindelinJul 7, 2015
  19. 10/12 t4150: tests for am --[no-]scissorsPaul Tan, Jul 2, 2015
  20. 11/12 t3418: non-interactive rebase --continue with rerere enabledPaul Tan, Jul 2, 2015
  21. 12/12 t3901: test git-am encoding conversionPaul Tan, Jul 2, 2015
  22. Johannes SixtJul 8, 2015
  23. Paul TanJul 14, 2015
  24. Stefan BellerJul 3, 2015
  25. Johannes SchindelinJul 5, 2015
  26. Junio C HamanoJul 6, 2015

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.