X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-repack.sh;h=9da92fb06139dc53061876f1532d9ee8c46d5346;hb=35ef237cf630418c2e45752eb527268693a2895b;hp=eb75c8cda95dabe190cfe9ddba0c6bd7072615f2;hpb=2cc06a0500b4b69e8563f76c42306e36b1f0aabf;p=git.git

diff --git a/git-repack.sh b/git-repack.sh
index eb75c8cda..9da92fb06 100755
--- a/git-repack.sh
+++ b/git-repack.sh
@@ -43,7 +43,9 @@ case ",$all_into_one," in
 	;;
 esac
 pack_objects="$pack_objects $local $quiet $no_reuse_delta$extra"
-name=$(git-rev-list --objects --all $rev_list 2>&1 |
+name=$( { git-rev-list --objects --all $rev_list ||
+	  echo "git-rev-list died with exit code $?"
+	} |
 	git-pack-objects --non-empty $pack_objects .tmp-pack) ||
 	exit 1
 if [ -z "$name" ]; then
@@ -54,9 +56,24 @@ else
 	fi
 	mkdir -p "$PACKDIR" || exit
 
-	mv .tmp-pack-$name.pack "$PACKDIR/pack-$name.pack" &&
-	mv .tmp-pack-$name.idx  "$PACKDIR/pack-$name.idx" ||
-	exit
+	for sfx in pack idx
+	do
+		if test -f "$PACKDIR/pack-$name.$sfx"
+		then
+			mv -f "$PACKDIR/pack-$name.$sfx" \
+				"$PACKDIR/old-pack-$name.$sfx"
+		fi
+	done &&
+	mv -f .tmp-pack-$name.pack "$PACKDIR/pack-$name.pack" &&
+	mv -f .tmp-pack-$name.idx  "$PACKDIR/pack-$name.idx" &&
+	test -f "$PACKDIR/pack-$name.pack" &&
+	test -f "$PACKDIR/pack-$name.idx" || {
+		echo >&2 "Couldn't replace the existing pack with updated one."
+		echo >&2 "The original set of packs have been saved as"
+		echo >&2 "old-pack-$name.{pack,idx} in $PACKDIR."
+		exit 1
+	}
+	rm -f "$PACKDIR/old-pack-$name.pack" "$PACKDIR/old-pack-$name.idx"
 fi
 
 if test "$remove_redundant" = t