anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-24 13:48:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Report if the git tree is not clean before we do anything.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39147 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2011-06-20 14:46:30 +00:00
parent 81164b09fc
commit f2e2119b3f
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
development/tools/update-po.sh
View File

@ -56,6 +56,15 @@ if svn log >/dev/null 2>&1; then
VCS="svn";
elif git diff >/dev/null 2>&1; then
VCS="git";
# We need to make sure that we have a tree without any unpushed
# commits. Otherwise git svn dcommit would commit more than we
# want.
if git status | grep -Pq 'Your branch is (?:ahead|behind)'; then
echo "Your git tree is not clean. Please correct the situation and re-run.";
echo;
git status;
exit 10;
fi
fi
if [ -z "$VCS" ]; then
@ -118,17 +127,8 @@ fi
if [ "$VCS" = "svn" ]; then
$DEBUG svn ci *.po;
else
# We need to make sure that we have a tree without any unpushed
# commits. Otherwise git svn dcommit would commit more than we
# want.
NOTSAFE="";
if git status | grep -Pq 'Your branch is (?:ahead|behind)'; then
NOTSAFE="TRUE";
fi
$DEBUG git commit *.po -m "Remerge strings.";
if [ -z "$NOTSAFE" ]; then
$DEBUG git svn dcommit;
fi
$DEBUG git svn dcommit;
fi
echo