diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-11-11 22:37:38 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-11-11 22:37:38 -0800 |
| commit | f7a2eb735982e921ae4379f1dcf5f7a023610393 (patch) | |
| tree | 26fe2c59a8fed68a531e7b855a495f52198162a2 /git-repack.sh | |
| parent | 23ea3e201cea0deea909569e08e950a9ec2345f7 (diff) | |
| parent | 7765e7ebda7e273bca34e87110be899447068b58 (diff) | |
| download | git-f7a2eb735982e921ae4379f1dcf5f7a023610393.tar.gz git-f7a2eb735982e921ae4379f1dcf5f7a023610393.tar.xz | |
This is GIT 1.0-rc1 in disguise. It is plausible that
relatively new parts of the system still need tweaking and
fixing, but that is why it is not 1.0 but rc ;-).
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-repack.sh')
| -rwxr-xr-x | git-repack.sh | 30 |
1 files changed, 12 insertions, 18 deletions
diff --git a/git-repack.sh b/git-repack.sh index d341966ef..f34720701 100755 --- a/git-repack.sh +++ b/git-repack.sh @@ -32,10 +32,6 @@ case ",$all_into_one," in rev_list= rev_parse='--all' pack_objects= - # This part is a stop-gap until we have proper pack redundancy - # checker. - existing=`cd "$PACKDIR" && \ - find . -type f \( -name '*.pack' -o -name '*.idx' \) -print` ;; esac if [ "$local" ]; then @@ -46,6 +42,14 @@ name=$(git-rev-list --objects $rev_list $(git-rev-parse $rev_parse) | exit 1 if [ -z "$name" ]; then echo Nothing new to pack. + if test "$remove_redandant" = t ; then + echo "Removing redundant packs." + sync + redundant=$(git-pack-redundant --all) + if test "$redundant" != "" ; then + echo $redundant | xargs rm + fi + fi exit 0 fi echo "Pack pack-$name created." @@ -58,20 +62,10 @@ exit if test "$remove_redandant" = t then - # We know $existing are all redandant only when - # all-into-one is used. - if test "$all_into_one" != '' && test "$existing" != '' - then - sync - ( cd "$PACKDIR" && - for e in $existing - do - case "$e" in - ./pack-$name.pack | ./pack-$name.idx) ;; - *) rm -f $e ;; - esac - done - ) + sync + redundant=$(git-pack-redundant --all) + if test "$redundant" != "" ; then + echo $redundant | xargs rm fi fi |