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

Re: [PATCH 3/7] strbuf: introduce strbuf_read_cmd helper

From
Jeff King <peff@peff.net>
Date
Mar 22, 2015, 23:36 UTC
Message-ID
<20150322233653.GB21518@peff.net>
In-Reply-To
<xmqqsicwbos5.fsf@gitster.dls.corp.google.com>
On Sun, Mar 22, 2015 at 04:22:50PM -0700, Junio C Hamano wrote:
Show 8 quoted lines
> > +/**
> >   * Read a line from a FILE *, overwriting the existing contents
> >   * of the strbuf. The second argument specifies the line
> >   * terminator character, typically `'\n'`.
> 
> It is an unfortunate tangent that this is a bugfix that may want to
> go to 'maint' and older, but our earlier jk/strbuf-doc-to-header
> topic introduces an unnecessary merge conflicts.

Yeah, that is the worst part of refactoring and cleanup. Even when you make sure you are not hurting any topics in flight, you cannot know when a new topic will take off in your general area.

> I've wiggled this part and moved the doc elsewhere, only to remove
> that in the merge, which may not be optimal from the point of view
> of what I have to do when merging this topic down from pu to next
> to master to maint, but I do not see a good way around it.

I'd suggest just dropping the documentation in the "maint" version (i.e., make it a moral cherry-pick of the function declaration only).

-Peff
Previous: Junio C HamanoNext: Jeff King
Message 22 of 26 in “status hangs trying to get submodule summary”
  1. Wincent ColaiutaMar 22, 2015
  2. status: read submodule process output before calling wait()Jeff King, Mar 22, 2015
  3. Jeff KingMar 22, 2015
  4. 0/7 introduce strbuf_read_cmd to avoid deadlocksJeff King, Mar 22, 2015
  5. 1/7 wt-status: don't flush before running "submodule status"Jeff King, Mar 22, 2015
  6. 2/7 wt_status: fix signedness mismatch in strbuf_read callJeff King, Mar 22, 2015
  7. 3/7 strbuf: introduce strbuf_read_cmd helperJeff King, Mar 22, 2015
  8. Eric SunshineMar 22, 2015
  9. Junio C HamanoMar 22, 2015
  10. Junio C HamanoMar 22, 2015
  11. 0/7 introduce capture_command to avoid deadlocksJeff King, Mar 23, 2015
  12. 1/7 wt-status: don't flush before running "submodule status"Jeff King, Mar 23, 2015
  13. 2/7 wt_status: fix signedness mismatch in strbuf_read callJeff King, Mar 23, 2015
  14. 3/7 run-command: introduce capture_command helperJeff King, Mar 23, 2015
  15. 4/7 wt-status: use capture_commandJeff King, Mar 23, 2015
  16. 5/7 submodule: use capture_commandJeff King, Mar 23, 2015
  17. 6/7 trailer: use capture_commandJeff King, Mar 23, 2015
  18. 7/7 run-command: forbid using run_command with piped outputJeff King, Mar 23, 2015
  19. Junio C HamanoMar 23, 2015
  20. Jeff KingMar 22, 2015
  21. Junio C HamanoMar 22, 2015
  22. Jeff KingMar 22, 2015
  23. 4/7 wt-status: use strbuf_read_cmdJeff King, Mar 22, 2015
  24. 5/7 submodule: use strbuf_read_cmdJeff King, Mar 22, 2015
  25. 6/7 trailer: use strbuf_read_cmdJeff King, Mar 22, 2015
  26. 7/7 run-command: forbid using run_command with piped outputJeff King, Mar 22, 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.