filter-branch: make output nicer

Instead of filling the screen with progress lines, use \r so that
the progress can be seen, but warning messages are more visible.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/git-filter-branch.sh b/git-filter-branch.sh
old mode 100644 (file)
new mode 100755 (executable)
index 5fa9b61..c22266b
--- a/git-filter-branch.sh
+++ b/git-filter-branch.sh
@@ -164,7 +164,7 @@ test $commits -eq 0 && die "Found nothing to rewrite"
 i=0
 while read commit parents; do
        i=$(($i+1))
 i=0
 while read commit parents; do
        i=$(($i+1))

-       printf "$commit ($i/$commits) "
+       printf "\rRewrite $commit ($i/$commits)"

 
        case "$filter_subdir" in
        "")
 
        case "$filter_subdir" in
        "")


@@ -207,8 +207,8 @@ while read commit parents; do
 
        sed -e '1,/^$/d' <../commit | \
                eval "$filter_msg" | \
 
        sed -e '1,/^$/d' <../commit | \
                eval "$filter_msg" | \

-               sh -c "$filter_commit" "git commit-tree" $(git write-tree) $parentstr | \
-               tee ../map/$commit
+               sh -c "$filter_commit" "git commit-tree" $(git write-tree) \
+                       $parentstr > ../map/$commit

 done <../revs
 
 src_head=$(tail -n 1 ../revs | sed -e 's/ .*//')
 done <../revs
 
 src_head=$(tail -n 1 ../revs | sed -e 's/ .*//')


@@ -260,6 +260,6 @@ fi
 
 cd ../..
 rm -rf "$tempdir"
 
 cd ../..
 rm -rf "$tempdir"

-echo "Rewritten history saved to the $dstbranch branch"
+printf "\nRewritten history saved to the $dstbranch branch\n"

 
 exit $ret
 
 exit $ret