Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=2dd3fea0bc2814a1412d619836f2e5b6963b36a5
commit 2dd3fea0bc2814a1412d619836f2e5b6963b36a5
Author: Miklos Vajna <[EMAIL PROTECTED]>
Date: Mon Nov 12 11:54:42 2007 +0100
dg push: try to automatically pull() if push() failed
diff --git a/darcs-git.py b/darcs-git.py
index 868ece9..3a0056b 100755
--- a/darcs-git.py
+++ b/darcs-git.py
@@ -577,9 +577,12 @@ Options:
print "Invalid response, try again!"
ret = os.system("git push %s" % options.gitopts)
if ret:
- return(1)
- else:
- os.system("git push --tags")
+ ret = pull(['-a'])
+ if not ret:
+ ret = os.system("git push %s" % options.gitopts)
+ if ret:
+ return(1)
+ os.system("git push --tags")
def pull(argv):
def usage(ret):
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
