1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-17 06:25:13 +01:00

Merge branch 'jc/repack'

* jc/repack:
  git-repack: Be careful when updating the same pack as an existing one.
This commit is contained in:
Junio C Hamano 2006-06-28 23:43:48 -07:00
commit 75dedd5a21

View file

@ -54,9 +54,24 @@ else
fi fi
mkdir -p "$PACKDIR" || exit mkdir -p "$PACKDIR" || exit
mv .tmp-pack-$name.pack "$PACKDIR/pack-$name.pack" && for sfx in pack idx
mv .tmp-pack-$name.idx "$PACKDIR/pack-$name.idx" || do
exit 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 fi
if test "$remove_redundant" = t if test "$remove_redundant" = t