Update release script to latest git

diff --git a/scripts/dorelease b/scripts/dorelease
index 6824e7381ca529b47d6e577f12963c01308afe63..31d1a582ad6f097bee2693717514cb0b07cc6cea 100755 (executable)
--- a/scripts/dorelease
+++ b/scripts/dorelease
@@ -50,24 +50,20 @@ echo "[ret] to continue"
 read
 
 # commit EXTRAVERSION change
-git-update-cache Makefile
-RELEASE_COMMIT=$(echo "Linux $RELEASE" | git-commit-tree $(git-write-tree) -p HEAD)
-echo $RELEASE_COMMIT > .git/HEAD
+git-update-index Makefile
+git commit -m "Linux $RELEASE"
 
 # tag it
-git-tag-script -u ${GIT_GPG_KEY} -m "This is the $RELEASE stable release" v$RELEASE
-
-BASE_COMMIT="$(git-cat-file tag $(cat .git/refs/tags/v${BASE}) | grep object | cut -d" " -f2)"
-LAST_COMMIT="$(git-cat-file tag $(cat .git/refs/tags/v${LAST_REL}) | grep object | cut -d" " -f2)"
+git tag -u "${GIT_GPG_KEY}" -m "This is the $RELEASE stable release" v$RELEASE
 
 # build release materials, tarball, base patch, incr patch, changelog
-git-tar-tree HEAD linux-$RELEASE | gzip -9 > $RELDIR/linux-${RELEASE}.tar.gz
-git-diff-tree -p $BASE_COMMIT $RELEASE_COMMIT | gzip -9 > $RELDIR/patch-${RELEASE}.gz
-git-diff-tree -p $LAST_COMMIT $RELEASE_COMMIT | gzip -9 > $RELDIR/patch-${LAST_REL}-${REL}.gz
-zcat $RELDIR/patch-${LAST_REL}-${REL}.gz | diffstat -p1 > $RELDIR/diffstat-${LAST_REL}-${REL} 2>/dev/null
-git log ${LAST_COMMIT}..${RELEASE_COMMIT} > $RELDIR/ChangeLog-$RELEASE
-< $RELDIR/ChangeLog-$RELEASE git-shortlog > $RELDIR/shortlog-$RELEASE
+git-tar-tree HEAD linux-${RELEASE} | gzip -9 > ${RELDIR}/linux-${RELEASE}.tar.gz
+git-diff-tree -p v${BASE} HEAD | gzip -9 > ${RELDIR}/patch-${RELEASE}.gz
+git-diff-tree -p v${LAST_REL} HEAD | gzip -9 > ${RELDIR}/patch-${LAST_REL}-${REL}.gz
+zcat ${RELDIR}/patch-${LAST_REL}-${REL}.gz | diffstat -p1 > ${RELDIR}/diffstat-${LAST_REL}-${REL} 2>/dev/null
+git log v${LAST_REL}..HEAD > ${RELDIR}/ChangeLog-${RELEASE}
+< ${RELDIR}/ChangeLog-${RELEASE} git-shortlog > ${RELDIR}/shortlog-${RELEASE}
 
 echo "ready to upload files"
-echo "scp $RELDIR/* master.kernel.org:$RELDIR/"
+echo "scp -r ${RELDIR} master.kernel.org:"
 echo "don't forget to update LATEST-IS"