Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'dk/p4-import-ctypes'
author
Junio C Hamano
<gitster@pobox.com>
Mon, 26 Oct 2015 22:55:26 +0000
(15:55 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 26 Oct 2015 22:55:26 +0000
(15:55 -0700)
"git-p4" tried to use from ctypes module without first importing
it.
* dk/p4-import-ctypes:
git-p4: import the ctypes module
1
2
git-p4.py
patch
|
diff1
|
diff2
|
blob
|
history
raw
|
combined
(merge:
fa46579
4b07cd2
)
diff --cc
git-p4.py
index daa60c60d6703ae76fd5cd168907f598207844d3,ff4113a661236f8306b0bd6ec1ced6600974c0ef..212ef2be9670bc2fe5573eee856471113eb96889
---
1
/
git-p4.py
---
2
/
git-p4.py
+++ b/
git-p4.py
@@@
-22,8
-22,7
+22,9
@@@
import platfor
import re
import shutil
import stat
+import zipfile
+import zlib
+ import ctypes
try:
from subprocess import CalledProcessError