Re: [TopGit PATCH 09/10] [RFC] tg-patch: use ui diff when pager is active

From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Date: Oct 9, 2010, 20:43 UTC
Message-ID: <20101009204348.GO29673@pengutronix.de>
In-Reply-To: <0fd777939e0ca49b6e0013ab667cadbfae55e879.1286524446.git.bert.wesarg@googlemail.com>

Hi Bert,

On Fri, Oct 08, 2010 at 09:58:07AM +0200, Bert Wesarg wrote:

> Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>

can you tell me the motivation for this patch again? It should go into the commit log, too.

Thanks Uwe

Show 26 quoted lines

> ---
>  tg-patch.sh |    7 ++++++-
>  1 files changed, 6 insertions(+), 1 deletions(-)
> 
> diff --git a/tg-patch.sh b/tg-patch.sh
> index 9def6e5..dcce672 100644 tg-patch.sh
> --- a/tg-patch.sh
> +++ b/tg-patch.sh
> @@ -70,7 +70,12 @@ t_tree=$(pretty_tree "$name" $head_from)
>  if [ $b_tree = $t_tree ]; then
>  	echo "No changes."
>  else
> -	git diff-tree -p --stat $b_tree $t_tree
> +	# use the ui diff command when the pager is active
> +	diff_command=diff
> +	[ "x$GIT_PAGER_IN_USE" = "x1" ] ||
> +		diff_command=diff-tree
> +
> +	git $diff_command -p --stat $b_tree $t_tree
>  fi
>  
>  echo '-- '
> -- 
> 1.7.1.1067.g5aeb7
> 
>

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |