@@ -128,7 +128,7 @@ __sha1_to_refname()
128128 git name-rev --name-only --no-undefined ${ONTO} --refs refs/heads/*
129129}
130130
131- __sanitize_todo ()
131+ __sanitize ()
132132{
133133 while read line; do
134134 ACTION=$( echo " $line " | awk ' { print $1}' )
@@ -150,12 +150,12 @@ __simple_sequence()
150150 local N_LINES=$( wc -l ${GIT_DIR} /sequencer/todo | awk ' { print $1}' )
151151 echo " # " $*
152152
153- tac ${GIT_DIR} /sequencer/todo | head -n $(( $N_LINES - 1 )) | __sanitize_todo | __colorize_todo
153+ tac ${GIT_DIR} /sequencer/todo | head -n $(( $N_LINES - 1 )) | __sanitize | __colorize_todo
154154
155155 if [ $( __has_unmerged) != " 0" ]; then
156- (echo -n ' *' ; head -n 1 ${GIT_DIR} /sequencer/todo) | __sanitize_todo | __colorize_current
156+ (echo -n ' *' ; head -n 1 ${GIT_DIR} /sequencer/todo) | __sanitize | __colorize_current
157157 else
158- head -n 1 ${GIT_DIR} /sequencer/todo | __sanitize_todo | __colorize_current
158+ head -n 1 ${GIT_DIR} /sequencer/todo | __sanitize | __colorize_current
159159 fi
160160
161161 __git_log_done HEAD ^${BASE}
@@ -187,15 +187,15 @@ __rebase_merge_sequence()
187187
188188 echo " # Interactive rebase: ${BASE_NICE} onto ${ONTO_NICE} "
189189 tac ${GIT_DIR} /rebase-merge/git-rebase-todo | egrep -v ' ^#' | \
190- egrep -v ' ^$' | __sanitize_todo | __colorize_todo
190+ egrep -v ' ^$' | __sanitize | __colorize_todo
191191
192192 if [ $( __has_unmerged) != " 0" ]; then
193- echo " *$CURRENT " | __sanitize_todo | __colorize_current
193+ echo " *$CURRENT " | __sanitize | __colorize_current
194194 else
195- echo " $CURRENT " | __sanitize_todo | __colorize_current
195+ echo " $CURRENT " | __sanitize | __colorize_current
196196 fi
197197
198- tac ${GIT_DIR} /rebase-merge/done | tail -n +2 | __sanitize_todo | __colorize_done
198+ tac ${GIT_DIR} /rebase-merge/done | tail -n +2 | __sanitize | __colorize_done
199199 __git_log_onto ${ONTO}
200200}
201201
0 commit comments