X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-repack.sh;h=458a497af810c7bb188a5aafb80c32aa0bc05264;hb=c841aa8b903200f5d7830c7c4ab8d62b5ef44c5c;hp=d39eb6cea6174ac65f1cc13c98e4abeab3a90903;hpb=f6576f4c0c6fa3b2d979faf28936c09480dedaab;p=git.git

diff --git a/git-repack.sh b/git-repack.sh
index d39eb6cea..458a497af 100755
--- a/git-repack.sh
+++ b/git-repack.sh
@@ -71,19 +71,17 @@ case ",$all_into_one," in
 				existing="$existing $e"
 			fi
 		done
-	fi
-	if test -z "$args"
-	then
-		args='--unpacked --incremental'
-	elif test -n "$unpack_unreachable"
-	then
-		args="$args $unpack_unreachable"
+		if test -n "$args" -a -n "$unpack_unreachable" -a \
+			-n "$remove_redundant"
+		then
+			args="$args $unpack_unreachable"
+		fi
 	fi
 	;;
 esac
 
 args="$args $local $quiet $no_reuse$extra"
-names=$(git pack-objects --non-empty --all --reflog $args </dev/null "$PACKTMP") ||
+names=$(git pack-objects --honor-pack-keep --non-empty --all --reflog $args </dev/null "$PACKTMP") ||
 	exit 1
 if [ -z "$names" ]; then
 	if test -z "$quiet"; then