vpnc at unix-ag
Jan 29, 2012, 1:47 AM
Post #1 of 1
(243 views)
Permalink
|
|
svn commit: vpnc r513 - /branches/vpnc-nortel/mk-version /trunk/mk-version
|
|
Author: Antonio Borneo
Date: Sun Jan 29 10:47:26 2012
New Revision: 513
Log:
Szabolcs Hubai <szab.hu [at] gmail>
I tried your patch with git version 1.6.1.2, and it doesn't understand
the "--count" option,
it introduces here:
https://github.com/git/git/commit/f69c501832ecd6880602c55565508e70c3a013d5
between 1.7.1 and 1.7.1.1 version.
So I changed line 44 to use wc to count instead git.
Modified:
branches/vpnc-nortel/mk-version
trunk/mk-version
Modified: branches/vpnc-nortel/mk-version
==============================================================================
--- branches/vpnc-nortel/mk-version (original)
+++ branches/vpnc-nortel/mk-version Sun Jan 29 10:47:26 2012
@@ -41,7 +41,7 @@
return
fi
- if [ $(git rev-list --count HEAD...${svn_commit}) -eq 0 ]; then
+ if [ $(git rev-list HEAD...${svn_commit} | wc -l) -eq 0 ]; then
if [ `git status -s | grep -vc '^??'` -eq 0 ]; then
# no git commits and tree clean
echo "${svn_ver}"
Modified: trunk/mk-version
==============================================================================
--- trunk/mk-version (original)
+++ trunk/mk-version Sun Jan 29 10:47:26 2012
@@ -41,7 +41,7 @@
return
fi
- if [ $(git rev-list --count HEAD...${svn_commit}) -eq 0 ]; then
+ if [ $(git rev-list HEAD...${svn_commit} | wc -l) -eq 0 ]; then
if [ `git status -s | grep -vc '^??'` -eq 0 ]; then
# no git commits and tree clean
echo "${svn_ver}"
_______________________________________________
vpnc-devel mailing list
vpnc-devel [at] unix-ag
https://lists.unix-ag.uni-kl.de/mailman/listinfo/vpnc-devel
http://www.unix-ag.uni-kl.de/~massar/vpnc/
|
