[PATCH] repack: don't report "Nothing new to pack." if -q is given

[PATCH] repack: don't report "Nothing new to pack." if -q is given

[Uwe Kleine-König]

Signed-off-by: Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
---
This patch is on top of maint.  For master and next you need
s/name/names/.

Best regards
Uwe

 git-repack.sh |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/git-repack.sh b/git-repack.sh
index ddfa8b4..d980275 100755
--- a/git-repack.sh
+++ b/git-repack.sh
@@ -65,7 +65,9 @@ args="$args $local $quiet $no_reuse_delta$extra"
 name=$(git-pack-objects --non-empty --all --reflog $args </dev/null "$PACKTMP") ||
 	exit 1
 if [ -z "$name" ]; then
-	echo Nothing new to pack.
+	if test -q "$quiet"; then
+		echo Nothing new to pack.
+	fi
 else
 	chmod a-w "$PACKTMP-$name.pack"
 	chmod a-w "$PACKTMP-$name.idx"
-- 
1.5.2.2.1451.gb0e5e


-- 
Uwe Kleine-König

exit vi, lesson II:
: w q ! <CR>

NB: write the current file

Re: [PATCH] repack: don't report "Nothing new to pack." if -q is given

[Peter Baumann]

On Tue, Jul 03, 2007 at 10:47:58AM +0200, Uwe Kleine-König wrote:
> Signed-off-by: Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
> ---
> This patch is on top of maint.  For master and next you need
> s/name/names/.
> 
> Best regards
> Uwe
> 
>  git-repack.sh |    4 +++-
>  1 files changed, 3 insertions(+), 1 deletions(-)
> 
> diff --git a/git-repack.sh b/git-repack.sh
> index ddfa8b4..d980275 100755
> --- a/git-repack.sh
> +++ b/git-repack.sh
> @@ -65,7 +65,9 @@ args="$args $local $quiet $no_reuse_delta$extra"
>  name=$(git-pack-objects --non-empty --all --reflog $args </dev/null "$PACKTMP") ||
>  	exit 1
>  if [ -z "$name" ]; then
> -	echo Nothing new to pack.
> +	if test -q "$quiet"; then
> +		echo Nothing new to pack.
> +	fi

This looks wrong, especially as I can't find a '-q' in the manpage of "test".
Perhaps you ment something like the following code, which is already used in
the script:

	if test "$quiet" != '-q'; then
		echo ...
	fi

-Peter

Re: [PATCH] repack: don't report "Nothing new to pack." if -q is given

[Uwe Kleine-König]

Signed-off-by: Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
---
Peter Baumann wrote:
> On Tue, Jul 03, 2007 at 10:47:58AM +0200, Uwe Kleine-König wrote:
> >  	exit 1
> >  if [ -z "$name" ]; then
> > -	echo Nothing new to pack.
> > +	if test -q "$quiet"; then
> > +		echo Nothing new to pack.
> > +	fi
> 
> This looks wrong, especially as I can't find a '-q' in the manpage of "test".
> Perhaps you ment something like the following code, which is already used in
> the script:
> 
> 	if test "$quiet" != '-q'; then
> 		echo ...
> 	fi
actually I meant test -z "$quiet", but test "$quiet" != '-q' would be
equally good.

Thanks for noticing.

Uwe

 git-repack.sh |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/git-repack.sh b/git-repack.sh
index ddfa8b4..1ce2760 100755
--- a/git-repack.sh
+++ b/git-repack.sh
@@ -65,7 +65,9 @@ args="$args $local $quiet $no_reuse_delta$extra"
 name=$(git-pack-objects --non-empty --all --reflog $args </dev/null "$PACKTMP") ||
 	exit 1
 if [ -z "$name" ]; then
-	echo Nothing new to pack.
+	if test -z "$quiet"; then
+		echo Nothing new to pack.
+	fi
 else
 	chmod a-w "$PACKTMP-$name.pack"
 	chmod a-w "$PACKTMP-$name.idx"
-- 
1.5.2.2.1451.gb0e5e



> > Best regards
> > Uwe
> > 
> >  git-repack.sh |    4 +++-
> >  1 files changed, 3 insertions(+), 1 deletions(-)
> > 
> > diff --git a/git-repack.sh b/git-repack.sh
> > index ddfa8b4..d980275 100755
> > --- a/git-repack.sh
> > +++ b/git-repack.sh
> > @@ -65,7 +65,9 @@ args="$args $local $quiet $no_reuse_delta$extra"
> >  name=$(git-pack-objects --non-empty --all --reflog $args </dev/null "$PACKTMP") ||

> -Peter
> 

-- 
Uwe Kleine-König

$ dc -e "5735816763073014741799356604682P"

Re: [PATCH] repack: don't report "Nothing new to pack." if -q is given

[Junio C Hamano]

Uwe Kleine-König  <ukleinek@informatik.uni-freiburg.de> writes:

> Signed-off-by: Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
> ---
> This patch is on top of maint.  For master and next you need
> s/name/names/.

Thanks.  But I won't be applying this to 'maint' for now; I do
not think it is big enough bugfix.