Re: [PATCH 4/4] Display a progress meter during merge-recursive.

From

Junio C Hamano <junkio@cox.net>

Date

Jan 14, 2007, 19:11 UTC

Message-ID

<7vwt3pfmph.fsf@assigned-by-dhcp.cox.net>

In-Reply-To

<Pine.LNX.4.63.0701141404160.22628@wbgn013.biozentrum.uni-wuerzburg.de>

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

> this is a nice idea, but I think you lack a "if (!isatty(1)) do_progress = 
> 0;" somewhere.

Very true.  Something like this?

diff --git a/merge-recursive.c b/merge-recursive.c
index 27a861b..fa320eb 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -1335,6 +1335,8 @@ int main(int argc, char *argv[])
 		buffer_output = 0;
 		do_progress = 0;
 	}
+	else
+		do_progress = isatty(1);
 
 	branch1 = argv[++i];
 	branch2 = argv[++i];
@@ -1344,10 +1346,7 @@ int main(int argc, char *argv[])
 
 	branch1 = better_branch_name(branch1);
 	branch2 = better_branch_name(branch2);
-	if (verbosity >= 5) {
-		buffer_output = 0;
-		do_progress = 0;
-	}
+
 	if (do_progress)
 		setup_progress_signal();
 	if (show(3))