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

[PATCH 0/2] Fix issue with format-patch and diff.submodule

From
Doug Kelly <dougk.ff7@gmail.com>
Date
Dec 26, 2014, 23:11 UTC
Message-ID
<1419635506-5045-1-git-send-email-dougk.ff7@gmail.com>

A colleague found an issue that when using diff.submodule=log in his .gitconfig, format-patch would use the log format for submodule changes, which would be ignored or error out when processed by git-am. format-patch now ignores the diff.submodule option and a testcase for this specific issue now exists.

Since this seems like a bug in current versions, I have based and tested this on the "maint" branch, but there's no reason it shouldn't apply cleanly to master as well.

Apologies for any rawness to the first round of this change. "Long time listener; first time caller." Any feedback is appreciated.

Doug Kelly (2):
  t4255: test am submodule with diff.submodule
  format-patch: ignore diff.submodule setting
 builtin/log.c           |  2 +-
 t/t4255-am-submodule.sh | 83 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 84 insertions(+), 1 deletion(-)
-- 
2.0.5
Next: Doug Kelly
Message 1 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.