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

[PATCH 03/31] rebase: read state outside loop

From
Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Date
Dec 28, 2010, 09:30 UTC
Message-ID
<1293528648-21873-4-git-send-email-martin.von.zweigbergk@gmail.com>
In-Reply-To
<1293528648-21873-1-git-send-email-martin.von.zweigbergk@gmail.com>

The 'onto_name' state used in 'git rebase --merge' is currently read once for each commit that need to be applied. It doesn't change between each iteration, however, so it should be moved out of the loop. This also makes the code more readable. Also remove the unused variable 'end'.

Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
---
 git-rebase.sh |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/git-rebase.sh b/git-rebase.sh
index bf144dc..9be831e 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -62,6 +62,7 @@ read_state () {
 	then
 		state_dir="$merge_dir"
 		prev_head=$(cat "$merge_dir"/prev_head) &&
+		onto_name=$(cat "$merge_dir"/onto_name) &&
 		end=$(cat "$merge_dir"/end) &&
 		msgnum=$(cat "$merge_dir"/msgnum)
 	else
@@ -123,9 +124,8 @@ call_merge () {
 	hd=$(git rev-parse --verify HEAD)
 	cmt_name=$(git symbolic-ref HEAD 2> /dev/null || echo HEAD)
 	msgnum=$(cat "$merge_dir/msgnum")
-	end=$(cat "$merge_dir/end")
 	eval GITHEAD_$cmt='"${cmt_name##refs/heads/}~$(($end - $msgnum))"'
-	eval GITHEAD_$hd='$(cat "$merge_dir/onto_name")'
+	eval GITHEAD_$hd='$onto_name'
 	export GITHEAD_$cmt GITHEAD_$hd
 	if test -n "$GIT_QUIET"
 	then

-- 
1.7.3.2.864.gbbb96
Previous: Martin von ZweigbergkNext: Martin von Zweigbergk
Message 8 of 118 in “Refactor rebase”
  1. 00/31 Refactor rebaseMartin von Zweigbergk, Dec 28, 2010
  2. 01/31 rebase: clearer names for directory variablesMartin von Zweigbergk, Dec 28, 2010
  3. Junio C HamanoDec 28, 2010
  4. Martin von ZweigbergkDec 28, 2010
  5. 02/31 rebase: refactor reading of stateMartin von Zweigbergk, Dec 28, 2010
  6. Junio C HamanoDec 28, 2010
  7. Martin von ZweigbergkDec 29, 2010
  8. 03/31 rebase: read state outside loopMartin von Zweigbergk, Dec 28, 2010
  9. 04/31 rebase: remove unused rebase state 'prev_head'Martin von Zweigbergk, Dec 28, 2010
  10. 05/31 rebase: improve detection of rebase in progressMartin von Zweigbergk, Dec 28, 2010
  11. Junio C HamanoDec 28, 2010
  12. Martin von ZweigbergkDec 28, 2010
  13. Martin von ZweigbergkJan 12, 2011
  14. 06/31 rebase: act on command line outside parsing loopMartin von Zweigbergk, Dec 28, 2010
  15. 07/31 rebase: stricter check of standalone sub commandMartin von Zweigbergk, Dec 28, 2010
  16. 08/31 rebase: align variable namesMartin von Zweigbergk, Dec 28, 2010
  17. Thomas RastJan 4, 2011
  18. Martin von ZweigbergkJan 5, 2011
  19. 09/31 rebase: align variable contentMartin von Zweigbergk, Dec 28, 2010
  20. 10/31 rebase: factor out command line option processingMartin von Zweigbergk, Dec 28, 2010
  21. 11/31 rebase -i: remove now unnecessary directory checksMartin von Zweigbergk, Dec 28, 2010
  22. 12/31 rebase: reorder validation stepsMartin von Zweigbergk, Dec 28, 2010
  23. 13/31 rebase: factor out reference parsingMartin von Zweigbergk, Dec 28, 2010
  24. 14/31 rebase: factor out clean work tree checkMartin von Zweigbergk, Dec 28, 2010
  25. 15/31 rebase: factor out call to pre-rebase hookMartin von Zweigbergk, Dec 28, 2010
  26. 16/31 rebase -i: support --statMartin von Zweigbergk, Dec 28, 2010
  27. Johannes SchindelinDec 28, 2010
  28. Martin von ZweigbergkDec 28, 2010
  29. Junio C HamanoDec 28, 2010
  30. Johannes SchindelinDec 28, 2010
  31. 17/31 rebase: remove $branch as synonym for $orig_headMartin von Zweigbergk, Dec 28, 2010
  32. 18/31 rebase: extract merge code to new source fileMartin von Zweigbergk, Dec 28, 2010
  33. Johannes SixtDec 29, 2010
  34. Martin von ZweigbergkDec 29, 2010
  35. Thomas RastDec 31, 2010
  36. Martin von ZweigbergkDec 31, 2010
  37. 19/31 rebase: extract am code to new source fileMartin von Zweigbergk, Dec 28, 2010
  38. 20/31 rebase: show consistent conflict resolution hintMartin von Zweigbergk, Dec 28, 2010
  39. 21/31 rebase -i: align variable namesMartin von Zweigbergk, Dec 28, 2010
  40. 22/31 rebase: make -v a tiny bit more verboseMartin von Zweigbergk, Dec 28, 2010
  41. 23/31 rebase: factor out sub command handlingMartin von Zweigbergk, Dec 28, 2010
  42. 24/31 rebase: extract code for writing basic stateMartin von Zweigbergk, Dec 28, 2010
  43. Thomas RastJan 4, 2011
  44. Martin von ZweigbergkJan 5, 2011
  45. 25/31 rebase: remember verbose optionMartin von Zweigbergk, Dec 28, 2010
  46. 26/31 rebase: remember strategy and strategy optionsMartin von Zweigbergk, Dec 28, 2010
  47. Thomas RastJan 4, 2011
  48. Martin von ZweigbergkJan 5, 2011
  49. 27/31 rebase -m: remember allow_rerere_autoupdate optionMartin von Zweigbergk, Dec 28, 2010
  50. 28/31 rebase -m: don't print exit code 2 when merge failsMartin von Zweigbergk, Dec 28, 2010
  51. 29/31 git-rebase--am: remove unnecessary --3way optionMartin von Zweigbergk, Dec 28, 2010
  52. 30/31 rebase -i: don't read unused variable preserve_mergesMartin von Zweigbergk, Dec 28, 2010
  53. 31/31 rebase -i: remove unnecessary state rebase-rootMartin von Zweigbergk, Dec 28, 2010
  54. Thomas RastDec 28, 2010
  55. Martin von ZweigbergkDec 29, 2010
  56. Christian CouderDec 31, 2010
  57. Thomas RastJan 4, 2011
  58. Martin von ZweigbergkJan 5, 2011
  59. 00/31 refactor rebaseMartin von Zweigbergk, Feb 6, 2011
  60. 01/31 rebase: clearer names for directory variablesMartin von Zweigbergk, Feb 6, 2011
  61. 02/31 rebase: refactor reading of stateMartin von Zweigbergk, Feb 6, 2011
  62. 03/31 rebase: read state outside loopMartin von Zweigbergk, Feb 6, 2011
  63. 04/31 rebase: remove unused rebase state 'prev_head'Martin von Zweigbergk, Feb 6, 2011
  64. 05/31 rebase: improve detection of rebase in progressMartin von Zweigbergk, Feb 6, 2011
  65. 06/31 rebase: act on command line outside parsing loopMartin von Zweigbergk, Feb 6, 2011
  66. 07/31 rebase: stricter check of standalone sub commandMartin von Zweigbergk, Feb 6, 2011
  67. Jonathan NiederJul 1, 2011
  68. Martin von ZweigbergkJul 1, 2011
  69. Jonathan NiederJul 1, 2011
  70. Martin von ZweigbergkJul 6, 2011
  71. 08/31 rebase: align variable namesMartin von Zweigbergk, Feb 6, 2011
  72. 09/31 rebase: align variable contentMartin von Zweigbergk, Feb 6, 2011
  73. 10/31 rebase: factor out command line option processingMartin von Zweigbergk, Feb 6, 2011
  74. 11/31 rebase -i: remove now unnecessary directory checksMartin von Zweigbergk, Feb 6, 2011
  75. 12/31 rebase: reorder validation stepsMartin von Zweigbergk, Feb 6, 2011
  76. 13/31 rebase: factor out reference parsingMartin von Zweigbergk, Feb 6, 2011
  77. 14/31 rebase: factor out clean work tree checkMartin von Zweigbergk, Feb 6, 2011
  78. 15/31 rebase: factor out call to pre-rebase hookMartin von Zweigbergk, Feb 6, 2011
  79. 16/31 rebase -i: support --statMartin von Zweigbergk, Feb 6, 2011
  80. 17/31 rebase: remove $branch as synonym for $orig_headMartin von Zweigbergk, Feb 6, 2011
  81. 18/31 rebase: extract merge code to new source fileMartin von Zweigbergk, Feb 6, 2011
  82. Johannes SixtFeb 14, 2011
  83. Martin von ZweigbergkFeb 14, 2011
  84. Martin von ZweigbergkFeb 24, 2011
  85. Jeff KingFeb 24, 2011
  86. Jeff KingFeb 24, 2011
  87. Martin von ZweigbergkFeb 25, 2011
  88. Jeff KingFeb 25, 2011
  89. Junio C HamanoFeb 25, 2011
  90. Jakub NarebskiFeb 25, 2011
  91. Jeff KingMar 1, 2011
  92. Jakub NarebskiMar 1, 2011
  93. 19/31 rebase: extract am code to new source fileMartin von Zweigbergk, Feb 6, 2011
  94. 20/31 rebase: show consistent conflict resolution hintMartin von Zweigbergk, Feb 6, 2011
  95. 21/31 rebase -i: align variable namesMartin von Zweigbergk, Feb 6, 2011
  96. 22/31 rebase: make -v a tiny bit more verboseMartin von Zweigbergk, Feb 6, 2011
  97. 23/31 rebase: factor out sub command handlingMartin von Zweigbergk, Feb 6, 2011
  98. 24/31 rebase: extract code for writing basic stateMartin von Zweigbergk, Feb 6, 2011
  99. 25/31 rebase: remember verbose optionMartin von Zweigbergk, Feb 6, 2011
  100. 26/31 rebase: remember strategy and strategy optionsMartin von Zweigbergk, Feb 6, 2011
  101. 27/31 rebase -m: remember allow_rerere_autoupdate optionMartin von Zweigbergk, Feb 6, 2011
  102. 28/31 rebase -m: don't print exit code 2 when merge failsMartin von Zweigbergk, Feb 6, 2011
  103. 29/31 git-rebase--am: remove unnecessary --3way optionMartin von Zweigbergk, Feb 6, 2011
  104. 30/31 rebase -i: don't read unused variable preserve_mergesMartin von Zweigbergk, Feb 6, 2011
  105. 31/31 rebase -i: remove unnecessary state rebase-rootMartin von Zweigbergk, Feb 6, 2011
  106. Junio C HamanoFeb 10, 2011
  107. Martin von ZweigbergkFeb 12, 2011
  108. Martin von ZweigbergkFeb 14, 2011
  109. Martin von ZweigbergkFeb 14, 2011
  110. Junio C HamanoFeb 15, 2011
  111. Martin von ZweigbergkFeb 22, 2011
  112. Junio C HamanoFeb 22, 2011
  113. Martin von ZweigbergkFeb 23, 2011
  114. Johannes SixtFeb 16, 2011
  115. Martin von ZweigbergkFeb 17, 2011
  116. rebase: define options in OPTIONS_SPECMartin von Zweigbergk, Feb 24, 2011
  117. Junio C HamanoFeb 27, 2011
  118. Martin von ZweigbergkMar 1, 2011

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.