Le 04/11/2011 10:21, Paul Poulain a écrit :
> process = git.am(filename, kwargs=**{'_interactive': True, '3': True})
Thanks robin, the correct syntax is without kwargs=
Here is the patch I made (yes, git-bz uses git ;-) )
Slef, feel free to attach to your repo
--
Paul POULAIN
http://www.biblibre.com
Expert en Logiciels Libres pour l'info-doc
Tel : (33) 4 91 81 35 08
>From ae058a195b719724952c6bc6201729fe98501029 Mon Sep 17 00:00:00 2001
From: Paul Poulain <[email protected]>
Date: Fri, 4 Nov 2011 10:59:47 +0100
Subject: [PATCH] Add -3 parameter to git am
With this patch, the git am now automatically has a -3 parameter
That makes no difference for patches that applies directly, but is useful when it's not the case
---
git-bz | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/git-bz b/git-bz
index 0d1fc91..9ebdf0a 100755
--- a/git-bz
+++ b/git-bz
@@ -1494,7 +1494,8 @@ def do_apply(bug_reference):
f.close()
try:
- process = git.am(filename, _interactive=True)
+ #process = git.am(filename, _interactive=True)
+ process = git.am(filename, **{'_interactive': True, '3': True})
except CalledProcessError:
print "Patch left in %s" % filename
break
--
1.7.5.4
_______________________________________________
Koha-devel mailing list
[email protected]
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-devel
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/
