Browse Source

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>
maint
Johannes Schindelin 18 years ago committed by Junio C Hamano
parent
commit
5efb48b5ed
  1. 8
      git-filter-branch.sh

8
git-filter-branch.sh

@ -164,7 +164,7 @@ test $commits -eq 0 && die "Found nothing to rewrite" @@ -164,7 +164,7 @@ test $commits -eq 0 && die "Found nothing to rewrite"
i=0
while read commit parents; do
i=$(($i+1))
printf "$commit ($i/$commits) "
printf "\rRewrite $commit ($i/$commits)"

case "$filter_subdir" in
"")
@ -207,8 +207,8 @@ while read commit parents; do @@ -207,8 +207,8 @@ while read commit parents; do

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/ .*//')
@ -260,6 +260,6 @@ fi @@ -260,6 +260,6 @@ fi

cd ../..
rm -rf "$tempdir"
echo "Rewritten history saved to the $dstbranch branch"
printf "\nRewritten history saved to the $dstbranch branch\n"

exit $ret

Loading…
Cancel
Save