repack: use only pack-objects, not rev-list.
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
		| @ -32,12 +32,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 +43,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. | ||||||
|  | |||||||
		Reference in New Issue
	
	Block a user
	 Junio C Hamano
					Junio C Hamano