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

Re: [PATCH 1/2] t4255: test am submodule with diff.submodule

From
Junio C Hamano <gitster@pobox.com>
Date
Dec 29, 2014, 15:42 UTC
Message-ID
<xmqqiogu1n06.fsf@gitster.dls.corp.google.com>
In-Reply-To
<CAPig+cT3gA2YpiT2Vr=F5-hB+Zy4ask-kz8DtpL3eFvz9PJb5Q@mail.gmail.com>
Eric Sunshine <sunshine@sunshineco.com> writes:
>> +       (git am --abort || true) &&

Why (x || y)? Is 'x' so unreliable that we do not know how should exit? Should this be "test_must_fail git am --abort"?

>> +       (cd submodule && git rev-parse HEAD >../actual) &&
"git -C submodule rev-parse HEAD >actual" perhaps?
>> +test_expect_success 'diff.submodule unset' '
>> +       (git config --unset diff.submodule || true) &&

I think test_config and test_unconfig were invented for things like this (same for all the other use of "git config").

Previous: Doug KellyNext: Doug Kelly
Message 5 of 18 in “Fix issue with format-patch and diff.submodule”
  1. 0/2 Fix issue with format-patch and diff.submoduleDoug Kelly, Dec 26, 2014
  2. 1/2 t4255: test am submodule with diff.submoduleDoug Kelly, Dec 26, 2014
  3. Eric SunshineDec 28, 2014
  4. Doug KellyDec 28, 2014
  5. Junio C HamanoDec 29, 2014
  6. Doug KellyJan 7, 2015
  7. Junio C HamanoJan 7, 2015
  8. 2/2 format-patch: ignore diff.submodule settingDoug Kelly, Dec 26, 2014
  9. 1/2 t4255: test am submodule with diff.submoduleDoug Kelly, Dec 28, 2014
  10. 2/2 format-patch: ignore diff.submodule settingDoug Kelly, Dec 28, 2014
  11. Eric SunshineDec 28, 2014
  12. 1/2 t4255: test am submodule with diff.submoduleDoug Kelly, Jan 7, 2015
  13. 2/2 format-patch: ignore diff.submodule settingDoug Kelly, Jan 7, 2015
  14. Eric SunshineJan 7, 2015
  15. 1/2 t4255: test am submodule with diff.submoduleDoug Kelly, Jan 7, 2015
  16. 2/2 format-patch: ignore diff.submodule settingDoug Kelly, Jan 7, 2015
  17. 1/2 t4255: test am submodule with diff.submoduleDoug Kelly, Jan 7, 2015
  18. 2/2 format-patch: ignore diff.submodule settingDoug Kelly, Jan 7, 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.