gitweb: Whitespace cleanup - tabs are for indent, spaces are for align

diff --git a/git-repack.sh b/git-repack.sh
index e0c9f323c3ba8a4f42ec5a4a4fa53a8bddb36b34..9da92fb06139dc53061876f1532d9ee8c46d5346 100755 (executable)
--- a/git-repack.sh
+++ b/git-repack.sh
@@ -43,20 +43,38 @@ 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
        echo Nothing new to pack.
-       exit 0
-fi
-echo "Pack pack-$name created."
-
-mkdir -p "$PACKDIR" || exit
+else
+       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
 then