mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Squelch bogus progress output from git-rebase--interactive

Browse Source 
The command repeats "Rebasing (1/1)" many times even when
there is only one task remaining, because mark_action_done() is
called to skip comment and empty lines in the TODO file.

This should fix it.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano
2008-01-14 20:01:21 -08:00
parent 471a5ce5dd
commit 4e6738778b
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
git-rebase--interactive.sh
View File

@ -73,14 +73,19 @@ comment_for_reflog () {
esac esac
} }
last_count=
mark_action_done () { mark_action_done () {
sed -e 1q < "$TODO" >> "$DONE" sed -e 1q < "$TODO" >> "$DONE"
sed -e 1d < "$TODO" >> "$TODO".new sed -e 1d < "$TODO" >> "$TODO".new
mv -f "$TODO".new "$TODO" mv -f "$TODO".new "$TODO"
count=$(($(grep -ve '^$' -e '^#' < "$DONE" | wc -l))) count=$(($(grep -ve '^$' -e '^#' < "$DONE" | wc -l)))
total=$(($count+$(grep -ve '^$' -e '^#' < "$TODO" | wc -l))) total=$(($count+$(grep -ve '^$' -e '^#' < "$TODO" | wc -l)))
if test "$last_count" != "$count"
then
last_count=$count
printf "Rebasing (%d/%d)\r" $count $total printf "Rebasing (%d/%d)\r" $count $total
test -z "$VERBOSE" || echo test -z "$VERBOSE" || echo
fi
} }
make_patch () { make_patch () {