Fix longstanding mismerge of ALL_CFLAGS vs BASIC_CFLAGS

diff --git a/git-repack.sh b/git-repack.sh
index 17e24526c279467891389295a55f8f257ca0d01b..ddfa8b44a17f1ea7ff039bca1d6132ba07e5cf12 100755 (executable)
--- a/git-repack.sh
+++ b/git-repack.sh
@@ -28,7 +28,7 @@ done
 # Later we will default repack.UseDeltaBaseOffset to true
 default_dbo=false
 
-case "`git repo-config --bool repack.usedeltabaseoffset ||
+case "`git config --bool repack.usedeltabaseoffset ||
        echo $default_dbo`" in
 true)
        extra="$extra --delta-base-offset" ;;
@@ -45,20 +45,30 @@ 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
 
 args="$args $local $quiet $no_reuse_delta$extra"
-name=$(git-pack-objects --non-empty --all $args </dev/null "$PACKTMP") ||
+name=$(git-pack-objects --non-empty --all --reflog $args </dev/null "$PACKTMP") ||
        exit 1
 if [ -z "$name" ]; then
        echo Nothing new to pack.
 else
+       chmod a-w "$PACKTMP-$name.pack"
+       chmod a-w "$PACKTMP-$name.idx"
        if test "$quiet" != '-q'; then
            echo "Pack pack-$name created."
        fi
@@ -86,22 +96,21 @@ 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
                )
        fi
-       git-prune-packed
+       git-prune-packed $quiet
 fi
 
 case "$no_update_info" in