make "repack -f" imply "pack-objects --no-reuse-object"
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> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
fa736f72b0
commit
479b56ba50
@ -8,7 +8,7 @@ SUBDIRECTORY_OK='Yes'
|
|||||||
. git-sh-setup
|
. git-sh-setup
|
||||||
|
|
||||||
no_update_info= all_into_one= remove_redundant=
|
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
|
while case "$#" in 0) break ;; esac
|
||||||
do
|
do
|
||||||
case "$1" in
|
case "$1" in
|
||||||
@ -16,7 +16,7 @@ do
|
|||||||
-a) all_into_one=t ;;
|
-a) all_into_one=t ;;
|
||||||
-d) remove_redundant=t ;;
|
-d) remove_redundant=t ;;
|
||||||
-q) quiet=-q ;;
|
-q) quiet=-q ;;
|
||||||
-f) no_reuse_delta=--no-reuse-delta ;;
|
-f) no_reuse=--no-reuse-object ;;
|
||||||
-l) local=--local ;;
|
-l) local=--local ;;
|
||||||
--window=*) extra="$extra $1" ;;
|
--window=*) extra="$extra $1" ;;
|
||||||
--depth=*) extra="$extra $1" ;;
|
--depth=*) extra="$extra $1" ;;
|
||||||
@ -61,7 +61,7 @@ case ",$all_into_one," in
|
|||||||
;;
|
;;
|
||||||
esac
|
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") ||
|
name=$(git-pack-objects --non-empty --all --reflog $args </dev/null "$PACKTMP") ||
|
||||||
exit 1
|
exit 1
|
||||||
if [ -z "$name" ]; then
|
if [ -z "$name" ]; then
|
||||||
|
Loading…
Reference in New Issue
Block a user