From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 26 Oct 2015 22:55:26 +0000 (-0700)
Subject: Merge branch 'dk/p4-import-ctypes'
X-Git-Tag: v2.7.0-rc0~73
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=922239e7da03f8e0a8c6ba809c1ee0cf3776f94a;p=thirdparty%2Fgit.git

Merge branch 'dk/p4-import-ctypes'

"git-p4" tried to use from ctypes module without first importing
it.

* dk/p4-import-ctypes:
  git-p4: import the ctypes module
---

922239e7da03f8e0a8c6ba809c1ee0cf3776f94a
diff --cc git-p4.py
index daa60c60d6,ff4113a661..212ef2be96
--- a/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