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

Re: [RFC PATCH v3 5/9] Use new functions in git_rebase__interactive

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Mar 23, 2018, 17:42 UTC
Message-ID
<nycvar.QRO.7.76.6.1803231838020.77@ZVAVAG-6OXH6DA.rhebcr.pbec.zvpebfbsg.pbz>
In-Reply-To
<387b3dc01562fd30f5894c91109d1a9d00d07720.1521690197.git.wink@saville.com>
Hi Wink,
On Thu, 22 Mar 2018, Wink Saville wrote:
Show 6 quoted lines
> Use initiate_action, setup_reflog_action, init_basic_state,
> init_revisions_and_shortrevisions and complete_action.
> 
> Signed-off-by: Wink Saville <wink@saville.com>
> ---
>  git-rebase--interactive.sh | 187 ++-------------------------------------------

If you fold this into the previous patch, I am sure that after your 3/9 indenting the function properly, the splitting into functions will look more or less like this:

-git_rebase__interactive () {
+initiate_action () {
+	action="$1"
 
 	[... unchanged code ...]
+}
+
+<next function> () {
+	[... setting up variables ...]
 
 	[.. unchanged code ...]
+}
[... more of the same ...]
+
+git_rebase__interactive () {
+	initiate_action "$action" &&
+ 	<next function> <arguments> &&
+	...
+}

In other words, it would be easier to review and to verify that the previous code is left unchanged (although that would have to be verified manually by applying 3/9 and then looking at the diff with the -w option, anyway).

Ciao, Johannes

Previous: Wink SavilleNext: Junio C Hamano
Message 14 of 20 in “rebase-interactive:”
  1. 0/9 rebase-interactive:Wink Saville, Mar 22, 2018
  2. 1/9 Simplify pick_on_preserving_mergesWink Saville, Mar 22, 2018
  3. 2/9 Call git_rebase__interactive from run_specific_rebaseWink Saville, Mar 22, 2018
  4. Junio C HamanoMar 22, 2018
  5. Wink SavilleMar 22, 2018
  6. 2/9 rebase-interactive: Do not automatically run codeWink Saville, Mar 22, 2018
  7. Junio C HamanoMar 22, 2018
  8. Wink SavilleMar 22, 2018
  9. Junio C HamanoMar 23, 2018
  10. 3/9 Indent function git_rebase__interactiveWink Saville, Mar 22, 2018
  11. Johannes SchindelinMar 23, 2018
  12. 4/9 Extract functions out of git_rebase__interactiveWink Saville, Mar 22, 2018
  13. 5/9 Use new functions in git_rebase__interactiveWink Saville, Mar 22, 2018
  14. Johannes SchindelinMar 23, 2018
  15. Junio C HamanoMar 23, 2018
  16. Wink SavilleMar 23, 2018
  17. 6/9 Add and use git_rebase__interactive__preserve_mergesWink Saville, Mar 22, 2018
  18. 8/9 Remove unused code paths from git_rebase__interactive__preserve_mergesWink Saville, Mar 22, 2018
  19. 9/9 Remove merges_option and a blank lineWink Saville, Mar 22, 2018
  20. 7/9 Remove unused code paths from git_rebase__interactiveWink Saville, Mar 22, 2018

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.