svnrevision.sh: also check for git-svn if there are un-dcomitted changes
authorsvnhieber <svnhieber@f8795833-4959-0410-8ae9-8bcb0cfab428>
Tue, 18 Jan 2011 18:19:04 +0000 (18:19 +0000)
committersvnhieber <svnhieber@f8795833-4959-0410-8ae9-8bcb0cfab428>
Tue, 18 Jan 2011 18:19:04 +0000 (18:19 +0000)
git-svn-id: https://svn.itm.uni-luebeck.de/wisebed/wiselib/trunk/pc_apps/roomba_tests@4092 f8795833-4959-0410-8ae9-8bcb0cfab428

svnrevision.sh

index c90f410..f4e014d 100755 (executable)
@@ -7,7 +7,9 @@ stat=$(svn status 2>&1|grep '^M')
 # if that fails, try git-svn
 if [ -z "$revision" ]; then
   revision=$(git svn info 2>&1|grep Revision|sed 's/Revision: //')
 # if that fails, try git-svn
 if [ -z "$revision" ]; then
   revision=$(git svn info 2>&1|grep Revision|sed 's/Revision: //')
-  stat=$(git status 2>&1|grep 'modified: ');
+  stat=$(git status 2>&1|grep 'modified: ')
+  # ...and also check if there are un-dcommited changesets
+  stat=$stat$(git diff --stat HEAD git-svn); 
 fi;
 
 # if that fails, give up
 fi;
 
 # if that fails, give up
This page took 0.045468 seconds and 4 git commands to generate.