Only repack active packs by skipping over kept packs.

During `git repack -a -d` only repack objects which are loose or
which reside in an active (a non-kept) pack.  This allows the user
to keep large packs as-is without continuous repacking and can be
very helpful on large repositories.  It should also help us resolve
a race condition between `git repack -a -d` and the new pack store
functionality in `git-receive-pack`.

Kept packs are those which have a corresponding .keep file in
$GIT_OBJECT_DIRECTORY/pack.  That is pack-X.pack will be kept
(not repacked and not deleted) if pack-X.keep exists in the same
directory when `git repack -a -d` starts.

Currently this feature is not documented and there is no user
interface to keep an existing pack.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/git-repack.sh b/git-repack.sh
index 17e24526c279467891389295a55f8f257ca0d01b..f150a558ca7a7a659f4eb88be3a275e1a4e87337 100755 (executable)
--- a/git-repack.sh
+++ b/git-repack.sh
@@ -45,11 +45,19 @@ case ",$all_into_one," in
        args='--unpacked --incremental'
        ;;
 ,t,)
        args='--unpacked --incremental'
        ;;
 ,t,)

-       args=
-
-       # Redundancy check in all-into-one case is trivial.
-       existing=`test -d "$PACKDIR" && cd "$PACKDIR" && \
-           find . -type f \( -name '*.pack' -o -name '*.idx' \) -print`
+       if [ -d "$PACKDIR" ]; then
+               for e in `cd "$PACKDIR" && find . -type f -name '*.pack' \
+                       | sed -e 's/^\.\///' -e 's/\.pack$//'`
+               do
+                       if [ -e "$PACKDIR/$e.keep" ]; then
+                               : keep
+                       else
+                               args="$args --unpacked=$e.pack"
+                               existing="$existing $e"
+                       fi
+               done
+       fi
+       [ -z "$args" ] && args='--unpacked --incremental'

        ;;
 esac
 
        ;;
 esac
 


@@ -86,17 +94,16 @@ fi
 
 if test "$remove_redundant" = t
 then
 
 if test "$remove_redundant" = t
 then

-       # We know $existing are all redundant only when
-       # all-into-one is used.
-       if test "$all_into_one" != '' && test "$existing" != ''
+       # We know $existing are all redundant.
+       if [ -n "$existing" ]

        then
                sync
                ( cd "$PACKDIR" &&
                  for e in $existing
                  do
                        case "$e" in
        then
                sync
                ( cd "$PACKDIR" &&
                  for e in $existing
                  do
                        case "$e" in

-                       ./pack-$name.pack | ./pack-$name.idx) ;;
-                       *)      rm -f $e ;;
+                       pack-$name) ;;
+                       *)      rm -f "$e.pack" "$e.idx" "$e.keep" ;;

                        esac
                  done
                )
                        esac
                  done
                )