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

michaelforney · michaelforney · commit 1d1477ab0b51 · 2021-02-15T21:22:33.000Z
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).
diff --git a/rebase b/rebase
@@ -46,10 +46,10 @@ todo=`$nl{cat .git/rebase.todo}
 
 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 @@ while(! ~ $#todo 0){
 	}
 }
 
+fn sigexit
 git/branch -nb $tmp $src
 git/branch -d $tmp
 rm .git/rebase.todo .git/rebase.src

Original file line number	Diff line number	Diff line change
@@ -46,10 +46,10 @@ todo=`$nl{cat .git/rebase.todo}
`46`	`46`
`47`	`47`	`fn sigexit {`
`48`	`48`	`s=$status`
`49`		`- if(!){`
`50`		`- echo $todo > .git/rebase.todo`
	`49`	`+ if(!)`
`51`	`50`	`echo 'fix and git/rebase -r'`
`52`		`- }`
	`51`	`+ >.git/rebase.todo for(i in $todo)`
	`52`	`+ echo $i`
`53`	`53`	`status=$s`
`54`	`54`	`}`
`55`	`55`
`@@ -86,6 +86,7 @@ while(! ~ $#todo 0){`
`86`	`86`	`}`
`87`	`87`	`}`
`88`	`88`
	`89`	`+fn sigexit`
`89`	`90`	`git/branch -nb $tmp $src`
`90`	`91`	`git/branch -d $tmp`
`91`	`92`	`rm .git/rebase.todo .git/rebase.src`