aboutsummaryrefslogtreecommitdiff
path: root/git-repack.sh
diff options
context:
space:
mode:
authorBrandon Casey <casey@nrlssc.navy.mil>2008-11-12 11:59:06 -0600
committerJunio C Hamano <gitster@pobox.com>2008-11-12 10:28:13 -0800
commitf7991d1ed37502c0e98dfa95866dfc1a8b08d834 (patch)
treec169a65c188d922c52e963bc2a3b0f235ff0aea0 /git-repack.sh
parentdd718365cccfddd7d5992a40296de50e7cabdfc8 (diff)
downloadgit-f7991d1ed37502c0e98dfa95866dfc1a8b08d834.tar.gz
git-f7991d1ed37502c0e98dfa95866dfc1a8b08d834.tar.xz
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>
Diffstat (limited to 'git-repack.sh')
-rwxr-xr-xgit-repack.sh11
1 files changed, 4 insertions, 7 deletions
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