make prepare-commit.sh work with git-new-workdir

qgis · May 18, 2017 · 0923f56 · 0923f56
1 parent 40972f0
commit 0923f56
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/scripts/prepare-commit.sh b/scripts/prepare-commit.sh
@@ -53,7 +53,7 @@ if [ -z "$MODIFIED" ]; then
   exit 0
 fi
 
-${TOPLEVEL}/scripts/spell_check/check_spelling.sh $MODIFIED
+[ -x ${TOPLEVEL}/scripts/spell_check/check_spelling.sh ] && ${TOPLEVEL}/scripts/spell_check/check_spelling.sh $MODIFIED
 
 # save original changes
 REV=$(git log -n1 --pretty=%H)

diff --git a/src/core/qgscoordinatereferencesystem.cpp b/src/core/qgscoordinatereferencesystem.cpp
@@ -2245,10 +2245,10 @@ bool QgsCoordinateReferenceSystem::syncDatumTransform( const QString &dbPath )
   QStringList v;
   v.reserve( sizeof( map ) / sizeof( *map ) );
 
-  for(;;)
+  for ( ;; )
   {
     char **values = CSVReadParseLine( fp );
-    if( !values )
+    if ( !values )
       break;
 
     v.clear();