[freeside-commits] branch master updated. 19eb5bfe24e9748fecb06f8d428ab4eb6791e195

Ivan ivan at 420.am
Tue Mar 6 13:12:31 PST 2012


The branch, master has been updated
       via  19eb5bfe24e9748fecb06f8d428ab4eb6791e195 (commit)
      from  9c8370e960bea77063028ce488fde8b6bb47b53c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 19eb5bfe24e9748fecb06f8d428ab4eb6791e195
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Tue Mar 6 13:12:24 2012 -0800

    uuh, seems to be working for me without -p?

diff --git a/bin/231commit b/bin/231commit
index fa031b5..ca28ede 100755
--- a/bin/231commit
+++ b/bin/231commit
@@ -20,8 +20,8 @@ die "no files!" unless @ARGV;
 system join('',
   "( cd /home/$USER/freeside2.3/$prefix; git pull ) && ",
   "( cd /home/$USER/freeside2.1/$prefix; git pull ) && ",
-  "git diff -u @ARGV | ( cd /home/$USER/freeside2.3/$prefix; patch -p0 ) ",
-  " && git diff -u @ARGV | ( cd /home/$USER/freeside2.1/$prefix; patch -p0 ) ",
+  "git diff -u @ARGV | ( cd /home/$USER/freeside2.3/$prefix; patch ) ",
+  " && git diff -u @ARGV | ( cd /home/$USER/freeside2.1/$prefix; patch ) ",
   " && ( ( git commit  -m $desc @ARGV && git push); ",
   "( cd /home/$USER/freeside2.3/$prefix; git commit -m $desc @ARGV && git push); ",
   "( cd /home/$USER/freeside2.1/$prefix; git commit -m $desc @ARGV && git push) )"
diff --git a/bin/23commit b/bin/23commit
index 3416925..b7b0c1e 100755
--- a/bin/23commit
+++ b/bin/23commit
@@ -19,8 +19,8 @@ die "no files!" unless @ARGV;
 #print <<END;
 system join('',
   "( cd /home/$USER/freeside2.3/$prefix; git pull ) && ",
-  "git diff -u @ARGV | ( cd /home/$USER/freeside2.3/$prefix; patch -p0 ) ",
-  " && ( ( git commit  -m $desc @ARGV && git push ); ",
+  "git diff -u @ARGV | ( cd /home/$USER/freeside2.3/$prefix; patch  ) ",
+  " && ( ( git pull && git commit  -m $desc @ARGV && git push ); ",
   "( cd /home/$USER/freeside2.3/$prefix; git commit -m $desc @ARGV && git push ) )"
 );
 

-----------------------------------------------------------------------

Summary of changes:
 bin/231commit |    4 ++--
 bin/23commit  |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)




More information about the freeside-commits mailing list