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

Re: [PATCH 1/2] t4151: document a pair of am --abort bugs

From
Junio C Hamano <gitster@pobox.com>
Date
Sep 8, 2021, 16:33 UTC
Message-ID
<xmqq1r5z58oq.fsf@gitster.g>
In-Reply-To
<CABPp-BGD9WdeiquX0eiMz2458pDhJpjOXGyUOqoXu52ohZVCsQ@mail.gmail.com>
Elijah Newren <newren@gmail.com> writes:
Show 27 quoted lines
> On Wed, Sep 8, 2021 at 12:02 AM Junio C Hamano <gitster@pobox.com> wrote:
>>
>> "Elijah Newren via GitGitGadget" <gitgitgadget@gmail.com> writes:
>>
>> > +test_expect_failure 'git am --abort returns us to a clean state' '
>> > +     git checkout changes &&
>> > +     git format-patch -1 --stdout conflicting >changes.mbox &&
>> > +     test_must_fail git am --3way changes.mbox &&
>> > +
>> > +     # Make a change related to the rest of the am work
>> > +     echo related change >>file-2 &&
>> > +
>> > +     # Abort, and expect the related change to go away too
>> > +     git am --abort &&
>> > +     git status --porcelain -uno >actual &&
>> > +     test_must_be_empty actual
>>
>> This test makes me worried.  It is perfectly normal for "am" to be
>> asked to work in a dirty working tree as long as the index is clean
>> and the working tree files that are involved in the patch are
>> unmodified.
>
> Ah, I think I am just too used to rebase where it refuses to start if
> the working tree isn't clean, assumed the same with am (which I don't
> use that much), and then projected from there.
>
> I'll drop the second test; thanks for the explanation.

Actually, if you test that unrelated dirty files are kept, then the test is a welcome addition. "returns us to a 'clean' state" needs a bit different title, though.

Thanks.
Previous: Elijah NewrenNext: Elijah Newren via GitGitGadget
Message 7 of 15 in “A pair of git am --abort issues”
  1. 0/2 A pair of git am --abort issuesElijah Newren via GitGitGadget, Sep 8, 2021
  2. 1/2 t4151: document a pair of am --abort bugsElijah Newren via GitGitGadget, Sep 8, 2021
  3. Bagas SanjayaSep 8, 2021
  4. Elijah NewrenSep 8, 2021
  5. Junio C HamanoSep 8, 2021
  6. Elijah NewrenSep 8, 2021
  7. Junio C HamanoSep 8, 2021
  8. 2/2 am: fix incorrect exit status on am fail to abortElijah Newren via GitGitGadget, Sep 8, 2021
  9. Junio C HamanoSep 8, 2021
  10. Johannes SchindelinSep 8, 2021
  11. 0/3 A pair of git am --abort issuesElijah Newren via GitGitGadget, Sep 10, 2021
  12. 1/3 git-am.txt: clarify --abort behaviorElijah Newren via GitGitGadget, Sep 10, 2021
  13. 2/3 t4151: add a few am --abort testsElijah Newren via GitGitGadget, Sep 10, 2021
  14. 3/3 am: fix incorrect exit status on am fail to abortElijah Newren via GitGitGadget, Sep 10, 2021
  15. Johannes SchindelinSep 13, 2021

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.