From mboxrd@z Thu Jan 1 00:00:00 1970 From: Johannes Schindelin Subject: [PATCH 1/2] filter-branch: make output nicer Date: Wed, 4 Jul 2007 15:33:30 +0100 (BST) Message-ID: Mime-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII To: git@vger.kernel.org, gitster@pobox.com X-From: git-owner@vger.kernel.org Wed Jul 04 16:33:45 2007 connect(): Connection refused Return-path: Envelope-to: gcvg-git@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1I65vM-00010J-Me for gcvg-git@gmane.org; Wed, 04 Jul 2007 16:33:45 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759500AbXGDOdl (ORCPT ); Wed, 4 Jul 2007 10:33:41 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1759411AbXGDOdl (ORCPT ); Wed, 4 Jul 2007 10:33:41 -0400 Received: from mail.gmx.net ([213.165.64.20]:39382 "HELO mail.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1759364AbXGDOdk (ORCPT ); Wed, 4 Jul 2007 10:33:40 -0400 Received: (qmail invoked by alias); 04 Jul 2007 14:33:38 -0000 Received: from unknown (EHLO [138.251.11.74]) [138.251.11.74] by mail.gmx.net (mp051) with SMTP; 04 Jul 2007 16:33:38 +0200 X-Authenticated: #1490710 X-Provags-ID: V01U2FsdGVkX1+Tlj4xCeST7rzxtt+kp9e85HQmKaExfRvD+Qv0Po HWX3+xqoOE8clY X-X-Sender: gene099@racer.site X-Y-GMX-Trusted: 0 Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: 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 --- Okay, this is actually tested. Several times. git-filter-branch.sh | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) mode change 100644 => 100755 git-filter-branch.sh diff --git a/git-filter-branch.sh b/git-filter-branch.sh old mode 100644 new mode 100755 index 22fb5bf..3bf5d88 --- a/git-filter-branch.sh +++ b/git-filter-branch.sh @@ -160,7 +160,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 "") @@ -203,8 +203,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/ .*//') @@ -256,6 +256,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 -- 1.5.3.rc0.2646.g88600-dirty