From: Junio C Hamano <junkio@cox.net>
Date: Thu, 29 Jun 2006 06:43:48 +0000 (-0700)
Subject: Merge branch 'jc/repack'
X-Git-Tag: v1.4.1~11
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/75dedd5a21246be03ae443e9fc6a9f75c6d2995b?hp=f38c2a9c9982950109d0eb0802b9713dfffeb18b

Merge branch 'jc/repack'

* jc/repack:
git-repack: Be careful when updating the same pack as an existing one.
---

diff --git a/git-repack.sh b/git-repack.sh
index eb75c8cda9..640ad8d90b 100755
--- a/git-repack.sh
+++ b/git-repack.sh
@@ -54,9 +54,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