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

Re: [PATCH] interpret-trailers: obey scissors lines

From
Brian Malehorn <bmalehorn@gmail.com>
Date
May 16, 2017, 06:06 UTC
Message-ID
<20170516060649.29110-1-bmalehorn@gmail.com>
In-Reply-To
<xmqq7f1iwxxd.fsf@gitster.mtv.corp.google.com>
Alright, I've made a new patch based on this feedback:
* make indentation consistent with rest of test file again
* rename function to wt_status_locate_end()
* rephrase commit message; add paragraph about wt_status_locate_end()
* s/scissors/cut line/
* Signed-off-by: me
Show 6 quoted lines
> The mention of "'commit -v -s' works that way, too" was my attempt
> to justify why it is OK to make this change unconditionally to
> intepret-trailers, but I am still not 100% convinced with that
> reasoning (or your original log message) that it is a safe thing to
> do.  It is not like its sole purpose is to serve as GIT_EDITOR for
> the "git commit" command.

Yup, this is a heuristic and it will sometimes hit false. But a far more grievous heuristic is ignoring all lines that begin with '#', yet we do that anyway for its convenience in editing commit messages. Since we already *partially* honor commit message syntax in interpret-trailers, we might as well *completely* honor it by parsing cut lines as well. At least, that's my reasoning.

Previous: Junio C HamanoNext: Brian Malehorn
Message 12 of 24 in “interpret-trailers + commit -v bugfix”
  1. 0/3 interpret-trailers + commit -v bugfixBrian Malehorn, May 12, 2017
  2. 2/3 commit.c: add is_scissors_lineBrian Malehorn, May 12, 2017
  3. Jeff KingMay 12, 2017
  4. Jeff KingMay 12, 2017
  5. Brian MalehornMay 14, 2017
  6. interpret-trailers: obey scissors linesBrian Malehorn, May 14, 2017
  7. Jeff KingMay 14, 2017
  8. Brian MalehornMay 14, 2017
  9. interpret-trailers: obey scissors linesBrian Malehorn, May 14, 2017
  10. Junio C HamanoMay 15, 2017
  11. Junio C HamanoMay 15, 2017
  12. Brian MalehornMay 16, 2017
  13. interpret-trailers: honor the cut lineBrian Malehorn, May 16, 2017
  14. Junio C HamanoMay 16, 2017
  15. Jeff KingMay 15, 2017
  16. Junio C HamanoMay 15, 2017
  17. Jeff KingMay 15, 2017
  18. Junio C HamanoMay 15, 2017
  19. Jeff KingMay 15, 2017
  20. Ævar Arnfjörð BjarmasonMay 14, 2017
  21. 1/3 mailinfo.c: is_scissors_line ends on newlineBrian Malehorn, May 12, 2017
  22. Jeff KingMay 12, 2017
  23. 3/3 commit.c: skip scissors when computing trailersBrian Malehorn, May 12, 2017
  24. Jeff KingMay 12, 2017

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.