Skip to content

Commit

Permalink
git/rebase: fix todo list when stopping for user interaction
Browse files Browse the repository at this point in the history
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).
  • Loading branch information
michaelforney committed Feb 15, 2021
1 parent 55509dc commit 1d1477a
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions rebase
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down Expand Up @@ -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

0 comments on commit 1d1477a

Please sign in to comment.