undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/repack'

Browse Source 
* jc/repack:
  git-repack: allow git-repack to run in subdirectory
  repack: use only pack-objects, not rev-list.
This commit is contained in:
Junio C Hamano 2006-09-27 21:46:07 -07:00
commit 1ad7a06adb
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
git-repack.sh
View File

@ -4,6 +4,7 @@
# #
USAGE='[-a] [-d] [-f] [-l] [-n] [-q]' USAGE='[-a] [-d] [-f] [-l] [-n] [-q]'
SUBDIRECTORY_OK='Yes'
. git-sh-setup . git-sh-setup
no_update_info= all_into_one= remove_redundant= no_update_info= all_into_one= remove_redundant=
@ -32,12 +33,10 @@ trap 'rm -f "$PACKTMP"-*' 0 1 2 3 15
# There will be more repacking strategies to come... # There will be more repacking strategies to come...
case ",$all_into_one," in case ",$all_into_one," in
,,) ,,)
rev_list='--unpacked' args='--unpacked --incremental'
pack_objects='--incremental'
;; ;;
,t,) ,t,)
rev_list= args=
pack_objects=
# Redundancy check in all-into-one case is trivial. # Redundancy check in all-into-one case is trivial.
existing=`test -d "$PACKDIR" && cd "$PACKDIR" && \ existing=`test -d "$PACKDIR" && cd "$PACKDIR" && \
@ -45,11 +44,8 @@ case ",$all_into_one," in
;; ;;
esac esac
pack_objects="$pack_objects $local $quiet $no_reuse_delta$extra" args="$args $local $quiet $no_reuse_delta$extra"
name=$( { git-rev-list --objects --all $rev_list || name=$(git-pack-objects --non-empty --all $args </dev/null "$PACKTMP") ||
echo "git-rev-list died with exit code $?"
} |
git-pack-objects --non-empty $pack_objects "$PACKTMP") ||
exit 1 exit 1
if [ -z "$name" ]; then if [ -z "$name" ]; then
echo Nothing new to pack. echo Nothing new to pack.