X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-repack.sh;h=4d313d136e64678b99179b2e1dce7a1beaa36d04;hb=c6576f912fc34193a02d7ec587484f7c2ce3fe77;hp=8c3bc134add87f38a764f24c63b9e09f562ad6b1;hpb=5e97f464df082d8f45e163bbf24341dceeafe89d;p=git.git

diff --git a/git-repack.sh b/git-repack.sh
index 8c3bc134a..4d313d136 100755
--- a/git-repack.sh
+++ b/git-repack.sh
@@ -5,12 +5,12 @@
 
 OPTIONS_KEEPDASHDASH=
 OPTIONS_SPEC="\
-git-repack [options]
+git repack [options]
 --
 a               pack everything in a single pack
 A               same as -a, and turn unreachable objects loose
 d               remove redundant packs, and run git-prune-packed
-f               pass --no-reuse-delta to git-pack-objects
+f               pass --no-reuse-object to git-pack-objects
 n               do not run git-update-server-info
 q,quiet         be quiet
 l               pass --local to git-pack-objects
@@ -71,19 +71,16 @@ 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"
+		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