shithub: git9

Download patch

ref: 1d1477ab0b51a00bd4f82a3ee1f788a0c82033f0
parent: 55509dc1d9861d0201908e1c412e8905fe1d800a
author: Michael Forney <[email protected]>
date: Mon Feb 15 16:22:33 EST 2021

git/rebase: fix todo list when stopping for user interaction

Print the items in a loop so they don't get merged into the same line.

Write the new todo list, even if there was no failure (for example
with edit or break commands in interactive mode).

--- a/rebase
+++ b/rebase
@@ -46,10 +46,10 @@
 
 fn sigexit {
 	s=$status
-	if(!){
-		echo $todo > .git/rebase.todo
+	if(!)
 		echo 'fix and git/rebase -r'
-	}
+	>.git/rebase.todo for(i in $todo)
+		echo $i
 	status=$s
 }
 
@@ -86,6 +86,7 @@
 	}
 }
 
+fn sigexit
 git/branch -nb $tmp $src
 git/branch -d $tmp
 rm .git/rebase.todo .git/rebase.src