py-gitpython: update to 2.1.8

remove integrated patch
This commit is contained in:
Zero King
2017-12-13 08:18:43 +00:00
parent 6742ba037a
commit 6fc2e738fd
2 changed files with 3 additions and 29 deletions
+3 -7
View File
@@ -3,9 +3,8 @@ PortSystem 1.0
PortGroup python 1.0
PortGroup github 1.0
github.setup gitpython-developers GitPython 2.1.7
github.setup gitpython-developers GitPython 2.1.8
name py-gitpython
revision 1
platforms darwin
license BSD
@@ -16,11 +15,8 @@ long_description GitPython provides object model access to your git \
repository. Once you have created a repository object, you \
can traverse it to find parent commit(s), trees, blobs, etc.
checksums rmd160 c5b11465a73231b08c9296e241dcd52634677b6f \
sha256 3b5d4ef0ddefb62302c1930b7910eeb9b215729c6f80db02a90aada00b18c9ef
patch.pre_args -p1
patchfiles patch-peeled.diff
checksums rmd160 c179bd338c7a37bb193f0ab4638596f606ab348a \
sha256 57039d0a0f65f53b398e03ad5e33fa29af4a402b8df46e7d5af91ab2b24eddc1
python.versions 27 36
@@ -1,22 +0,0 @@
# https://github.com/gitpython-developers/GitPython/pull/689
diff --git a/git/refs/symbolic.py b/git/refs/symbolic.py
index bef6ba3c..8efeafc5 100644
--- a/git/refs/symbolic.py
+++ b/git/refs/symbolic.py
@@ -96,7 +96,15 @@ def _iter_packed_refs(cls, repo):
if not line:
continue
if line.startswith('#'):
- if line.startswith('# pack-refs with:') and not line.endswith('peeled'):
+ # "# pack-refs with: peeled fully-peeled sorted"
+ # the git source code shows "peeled",
+ # "fully-peeled" and "sorted" as the keywords
+ # that can go on this line, as per comments in git file
+ # refs/packed-backend.c
+ # I looked at master on 2017-10-11,
+ # commit 111ef79afe, after tag v2.15.0-rc1
+ # from repo https://github.com/git/git.git
+ if line.startswith('# pack-refs with:') and 'peeled' not in line:
raise TypeError("PackingType of packed-Refs not understood: %r" % line)
# END abort if we do not understand the packing scheme
continue