Merge branch 'th/diff'

diff --git a/git-repack.sh b/git-repack.sh
index 4fb3f26e834f78d40ea629dcd6732d390a129d58..640ad8d90b9a9afd00506a9697af1d3e560e1255 100755 (executable)
--- a/git-repack.sh
+++ b/git-repack.sh
@@ -49,13 +49,29 @@ name=$(git-rev-list --objects --all $rev_list 2>&1 |
 if [ -z "$name" ]; then
        echo Nothing new to pack.
 else
-       echo "Pack pack-$name created."
-
+       if test "$quiet" != '-q'; then
+           echo "Pack pack-$name created."
+       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