From: Brandon Casey <casey@nrlssc.navy.mil>
Date: Wed, 12 Nov 2008 17:59:06 +0000 (-0600)
Subject: repack: do not fall back to incremental repacking with [-a|-A]
X-Git-Tag: v1.6.1-rc1~41^2~6
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f7991d1ed37502c0e98dfa95866dfc1a8b08d834;p=git.git

repack: do not fall back to incremental repacking with [-a|-A]

When repack is called with either the -a or -A option, the user has
requested to repack all objects including those referenced by the
alternates mechanism. Currently, if there are no local packs without
.keep files, then repack will call pack-objects with the
'--unpacked --incremental' options which causes it to exclude alternate
packed objects. So, remove this fallback.

Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git-repack.sh b/git-repack.sh
index 8bb22014b..4d313d136 100755
--- a/git-repack.sh
+++ b/git-repack.sh
@@ -71,13 +71,10 @@ 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