OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

gcc_update: Support updating a git clone.

Browse Source 
2010-06-15  Bernhard Reutner-Fischer  <aldot@gcc.gnu.org>

	* gcc_update: Support updating a git clone.

From-SVN: r160774
This commit is contained in:
Bernhard Reutner-Fischer 2010-06-15 10:35:25 +02:00
parent 070b27da92
commit e31a6dc2db
2 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/ChangeLog
View File

@ -1,3 +1,7 @@
2010-06-15 Bernhard Reutner-Fischer <aldot@gcc.gnu.org>
* gcc_update: Support updating a git clone.
2010-06-04 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
* test_summary: Don't use diff -u.

31
contrib/gcc_update
View File

@ -245,8 +245,13 @@ p
esac
is_git=0
# Check whether this indeed looks like a local SVN tree.
if [ ! -d .svn ]; then
if [ -d .git ]; then
GCC_GIT=${GCC_GIT-${GIT-git}}
GCC_SVN="true -"
is_git=1
elif [ ! -d .svn ]; then
echo "This does not seem to be a GCC SVN tree!"
exit
fi
@ -258,6 +263,7 @@ else
set -- $UPDATE_OPTIONS ${1+"$@"}
fi
if [ $is_git -eq 0 ]; then
chat "Updating SVN tree"
$GCC_SVN ${silent+-q} --non-interactive update ${1+"$@"}
@ -283,4 +289,27 @@ p
echo "[$branch revision $revision]" > gcc/REVISION
else
chat "Updating GIT tree"
$GCC_GIT diff --quiet --exit-code HEAD
if [ $? -ne 0 ]; then
echo "Attempting to update a dirty git tree!" >&2
echo "Commit or stash your changes first and retry." >&2
exit 1
fi
$GCC_GIT pull ${silent+-q} --rebase ${1+"$@"}
if [ $? -ne 0 ]; then
(touch_files_reexec)
echo "git pull of full tree failed." >&2
exit 1
fi
rm -f LAST_UPDATED gcc/REVISION
revision=`$GCC_GIT log -n1 --pretty=%p:%t:%H`
branch=`$GCC_GIT name-rev --name-only HEAD || :`
{
date
echo "`TZ=UTC date` (revision $revision)"
} > LAST_UPDATED
echo "[$branch revision $revision]" > gcc/REVISION
fi
touch_files_reexec