diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-09-27 21:46:07 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-09-27 21:46:07 -0700 |
| commit | 1ad7a06adb6fbe42357daa58738008cbadbb8650 (patch) | |
| tree | cb520f5c3e011868a96bbdccb03ba54294187fea | |
| parent | e38604e00637a7b25c12c0ef1423a6135cbf049b (diff) | |
| parent | d0b353b1a7a2f5168a8e2c992403f2a7d1e323f8 (diff) | |
| download | git-1ad7a06adb6fbe42357daa58738008cbadbb8650.tar.gz git-1ad7a06adb6fbe42357daa58738008cbadbb8650.tar.xz | |
Merge branch 'jc/repack'
* jc/repack:
git-repack: allow git-repack to run in subdirectory
repack: use only pack-objects, not rev-list.
| -rwxr-xr-x | git-repack.sh | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/git-repack.sh b/git-repack.sh index b525fc5df..f2c9071d1 100755 --- a/git-repack.sh +++ b/git-repack.sh @@ -4,6 +4,7 @@ # USAGE='[-a] [-d] [-f] [-l] [-n] [-q]' +SUBDIRECTORY_OK='Yes' . git-sh-setup 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... case ",$all_into_one," in ,,) - rev_list='--unpacked' - pack_objects='--incremental' + args='--unpacked --incremental' ;; ,t,) - rev_list= - pack_objects= + args= # Redundancy check in all-into-one case is trivial. existing=`test -d "$PACKDIR" && cd "$PACKDIR" && \ @@ -45,11 +44,8 @@ case ",$all_into_one," in ;; esac -pack_objects="$pack_objects $local $quiet $no_reuse_delta$extra" -name=$( { git-rev-list --objects --all $rev_list || - echo "git-rev-list died with exit code $?" - } | - git-pack-objects --non-empty $pack_objects "$PACKTMP") || +args="$args $local $quiet $no_reuse_delta$extra" +name=$(git-pack-objects --non-empty --all $args </dev/null "$PACKTMP") || exit 1 if [ -z "$name" ]; then echo Nothing new to pack. |