[Erp5-report] r45848 jm - /erp5/trunk/utils/git-helpers/git-auto-push

[nobody at svn.erp5.org]

Author: jm
Date: Thu May 12 15:55:38 2011
New Revision: 45848

URL: http://svn.erp5.org?rev=45848&view=rev
Log:
Make git-auto-push less confusing when rebase fails

Modified:
    erp5/trunk/utils/git-helpers/git-auto-push

Modified: erp5/trunk/utils/git-helpers/git-auto-push
URL: http://svn.erp5.org/erp5/trunk/utils/git-helpers/git-auto-push?rev=45848&r1=45847&r2=45848&view=diff
==============================================================================
--- erp5/trunk/utils/git-helpers/git-auto-push [utf8] (original)
+++ erp5/trunk/utils/git-helpers/git-auto-push [utf8] Thu May 12 15:55:38 2011
@@ -40,14 +40,12 @@ def main():
                 raise
             # try to update our working copy
             try:
-                _git('rebase', '@{u}')
-            except GitError, e:
+                git('rebase', '@{u}')
+            except GitError:
                 # XXX: how to know how it failed ?
-                try:
-                    _git('rebase', '--abort')
-                except GitError:
-                    pass
-                raise
+                sys.stderr.write('Rebasing failed. Aborting...\n')
+                _git('rebase', '--abort')
+                return 1
             # retry to push everything
             _git(*push_args)
     except GitError, e: