branch --track: code cleanup and saner handling of local branches

diff --git a/git-repack.sh b/git-repack.sh
index 4ea6e5b9e5530be4fb53c973df0055b776875742..b5c667110d31fe9e083f8b7d4db727ed63333e37 100755 (executable)
--- a/git-repack.sh
+++ b/git-repack.sh
@@ -63,12 +63,15 @@ case ",$all_into_one," in
 esac
 
 args="$args $local $quiet $no_reuse$extra"
-names=$(git-pack-objects --non-empty --all --reflog $args </dev/null "$PACKTMP") ||
+names=$(git pack-objects --non-empty --all --reflog $args </dev/null "$PACKTMP") ||
        exit 1
 if [ -z "$names" ]; then
-       echo Nothing new to pack.
+       if test -z "$quiet"; then
+               echo Nothing new to pack.
+       fi
 fi
 for name in $names ; do
+       fullbases="$fullbases pack-$name"
        chmod a-w "$PACKTMP-$name.pack"
        chmod a-w "$PACKTMP-$name.idx"
        if test "$quiet" != '-q'; then
@@ -105,14 +108,14 @@ then
                ( cd "$PACKDIR" &&
                  for e in $existing
                  do
-                       case "$e" in
-                       pack-$name) ;;
+                       case " $fullbases " in
+                       *" $e "*) ;;
                        *)      rm -f "$e.pack" "$e.idx" "$e.keep" ;;
                        esac
                  done
                )
        fi
-       git-prune-packed $quiet
+       git prune-packed $quiet
 fi
 
 case "$no_update_info" in