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

Re: [RFC/PATCH 00/18] WIP implement cherry-pick/revert --continue

From
Jonathan Nieder <jrnieder@gmail.com>
Date
Nov 26, 2010, 06:28 UTC
Message-ID
<20101126062836.GF18751@burratino>
In-Reply-To
<20101125210138.5188.13115.chriscool@tuxfamily.org>
Hi Christian,
Christian Couder wrote:
Show 6 quoted lines
> Many patches in this series are replacing calls to "die()" by
> "return error()", because the TODO and DONE files are written
> only when cherry-pick fails. This is efficient but perhaps it
> would be simpler and safer to write them before each cherry-pick
> just in case it fails, so that the "die()" calls don't need to
> be removed.

Another possibility would be to use set_die_routine()/atexit()/ sigchain_push_common(), but the "always write" solution does seem simpler.

> (17):
Perhaps too many. :)

I like where this is going. My main complaint is the commit messages; given a clear explanation of the design it should not be too hard for others to help write documentation, enhancements, and tests, but without it is much harder.

Nit: the style of commit message in patch 16 is unnecessarily
demoralizing.  It basically says "track down the history in this repo
that may not exist in 2050 if you want to know what this patch is
about".  I think it would be better to say
	This code was written as part of the git sequencer
	Google Summer of Code project, 2008

and let the rest of the commit message tell the important details. Readers can google for the detailed history.

Thanks for your work. Jonathan

Previous: Christian Couder
Message 27 of 27 in “WIP implement cherry-pick/revert --continue”
  1. 00/18 WIP implement cherry-pick/revert --continueChristian Couder, Nov 25, 2010
  2. 01/18 advice: add error_resolve_conflict() functionChristian Couder, Nov 25, 2010
  3. Jonathan NiederNov 26, 2010
  4. 02/18 revert: change many die() calls into "return error()" callsChristian Couder, Nov 25, 2010
  5. Jonathan NiederNov 26, 2010
  6. 03/18 usage: implement error_errno() the same way as die_errno()Christian Couder, Nov 25, 2010
  7. Jonathan NiederNov 26, 2010
  8. Junio C HamanoNov 26, 2010
  9. 04/18 revert: don't die when write_message() failsChristian Couder, Nov 25, 2010
  10. 05/18 commit: move reverse_commit_list() into commit.{h, c}Christian Couder, Nov 25, 2010
  11. 06/18 revert: remove "commit" global variableChristian Couder, Nov 25, 2010
  12. 07/18 revert: put option information in an option structChristian Couder, Nov 25, 2010
  13. Jonathan NiederNov 26, 2010
  14. Junio C HamanoNov 26, 2010
  15. 08/18 revert: refactor code into a new pick_commits() functionChristian Couder, Nov 25, 2010
  16. Daniel BarkalowNov 27, 2010
  17. 09/18 revert: make pick_commits() return an error on --ff incompatible optionChristian Couder, Nov 25, 2010
  18. 10/18 revert: make read_and_refresh_cache() and prepare_revs() return errorsChristian Couder, Nov 25, 2010
  19. 11/18 revert: add get_todo_content() and create_todo_file()Christian Couder, Nov 25, 2010
  20. 12/18 revert: write TODO and DONE files in case of failureChristian Couder, Nov 25, 2010
  21. 13/18 revert: add option parsing for option --continueChristian Couder, Nov 25, 2010
  22. 14/18 revert: move global variable "me" into "struct args_info"Christian Couder, Nov 25, 2010
  23. 15/18 revert: add NONE action and make parse_args() manage itChristian Couder, Nov 25, 2010
  24. 16/18 revert: implement parsing TODO and DONE filesChristian Couder, Nov 25, 2010
  25. 17/18 revert: add remaining instructions in todo fileChristian Couder, Nov 25, 2010
  26. 18/18 revert: implement --continue processingChristian Couder, Nov 25, 2010
  27. Jonathan NiederNov 26, 2010

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.