git-branch -D: make it work even when on a yet-to-be-born branch

diff --git a/git-repack.sh b/git-repack.sh
index 9ae5092208aab167f9164dd729297d92fa4948c6..f150a558ca7a7a659f4eb88be3a275e1a4e87337 100755 (executable)
--- a/git-repack.sh
+++ b/git-repack.sh
@@ -3,7 +3,8 @@
 # Copyright (c) 2005 Linus Torvalds
 #
 
-USAGE='[-a] [-d] [-f] [-l] [-n] [-q]'
+USAGE='[-a] [-d] [-f] [-l] [-n] [-q] [--window=N] [--depth=N]'
+SUBDIRECTORY_OK='Yes'
 . git-sh-setup
 
 no_update_info= all_into_one= remove_redundant=
@@ -24,6 +25,15 @@ do
        shift
 done
 
+# Later we will default repack.UseDeltaBaseOffset to true
+default_dbo=false
+
+case "`git repo-config --bool repack.usedeltabaseoffset ||
+       echo $default_dbo`" in
+true)
+       extra="$extra --delta-base-offset" ;;
+esac
+
 PACKDIR="$GIT_OBJECT_DIRECTORY/pack"
 PACKTMP="$GIT_DIR/.tmp-$$-pack"
 rm -f "$PACKTMP"-*
@@ -35,11 +45,19 @@ case ",$all_into_one," in
        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
 
@@ -76,17 +94,16 @@ fi
 
 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
-                       ./pack-$name.pack | ./pack-$name.idx) ;;
-                       *)      rm -f $e ;;
+                       pack-$name) ;;
+                       *)      rm -f "$e.pack" "$e.idx" "$e.keep" ;;
                        esac
                  done
                )