From: Richard Heck <rgheck@comcast.net>
Date: Mon, 20 Jun 2011 14:46:30 +0000 (+0000)
Subject: Report if the git tree is not clean before we do anything.
X-Git-Tag: 2.0.1~149
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=f2e2119b3f25019cb91b280e2eacaa5202a94966;p=features.git

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

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39147 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/development/tools/update-po.sh b/development/tools/update-po.sh
index e39f712532..ed972c4ed2 100644
--- a/development/tools/update-po.sh
+++ b/development/tools/update-po.sh
@@ -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