[PATCH] make "repack -f" imply "pack-objects --no-reuse-object"

From

Nicolas Pitre <nico@cam.org>

Date

May 9, 2007, 16:59 UTC

Message-ID

<alpine.LFD.0.99.0705091247450.24220@xanadu.home>

In-Reply-To

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

As Junio said:

  Recomputing delta is much more expensive than recompressing
  anyway, and when the user says 'repack -f', it is a sign that
  the user is willing to spend CPU cycles.

Signed-off-by: Nicolas Pitre <nico@cam.org>
---

On Wed, 9 May 2007, Junio C Hamano wrote:

> Nicolas Pitre <nico@cam.org> writes:
> 
> > What we need instead is a --no-reuse-object that would force 
> > recompression of everything when you really want to enforce a specific 
> > compression level across the whole pack(s).
> 
> Yeah.  Or maybe --no-reuse to mean both and make '-f' a
> short-hand synonym for that.
> 
> I do not see much reason to want to tweak them independently;
> recomputing delta is much more expensive than recompressing
> anyway, and when the user says 'repack -f', it is a sign that
> the user is willing to spend CPU cycles.

diff --git a/git-repack.sh b/git-repack.sh
index ddfa8b4..8bf66a4 100755
--- a/git-repack.sh
+++ b/git-repack.sh
@@ -8,7 +8,7 @@ SUBDIRECTORY_OK='Yes'
 . git-sh-setup
 
 no_update_info= all_into_one= remove_redundant=
-local= quiet= no_reuse_delta= extra=
+local= quiet= no_reuse= extra=
 while case "$#" in 0) break ;; esac
 do
 	case "$1" in
@@ -16,7 +16,7 @@ do
 	-a)	all_into_one=t ;;
 	-d)	remove_redundant=t ;;
 	-q)	quiet=-q ;;
-	-f)	no_reuse_delta=--no-reuse-delta ;;
+	-f)	no_reuse=--no-reuse-object ;;
 	-l)	local=--local ;;
 	--window=*) extra="$extra $1" ;;
 	--depth=*) extra="$extra $1" ;;
@@ -61,7 +61,7 @@ case ",$all_into_one," in
 	;;
 esac
 
-args="$args $local $quiet $no_reuse_delta$extra"
+args="$args $local $quiet $no_reuse$extra"
 name=$(git-pack-objects --non-empty --all --reflog $args </dev/null "$PACKTMP") ||
 	exit 1
 if [ -z "$name" ]; then