Skip to content
This repository was archived by the owner on Sep 26, 2019. It is now read-only.

Commit 06957db

Browse files
author
David Shrewsbury
committed
Use diff long options and uncap GitPython
GitPython had a very incompatible change that breaks any call that uses a single character option (e.g., -U) that requires no space between the option and the value. So far, this breaks the diff API where we used the -U option instead of the long option equivalent. For history: gitpython-developers/GitPython#382 So far, I've only seen one place where this bites gertty. Since the GitPython author has stated this will not be reverted or fixed, having a permanent cap on that library seems harsh as we won't get any other bug fixes. This fixes the known/found areas where we are affected. Change-Id: Iadb279234af2ea01fbff35dc629c01dae5a3195c
1 parent b33cbc0 commit 06957db

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

gertty/gitrepo.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ def diff(self, old, new, context=10000, show_old_commit=False):
388388
extra_contexts.append(CommitContext(None, newc))
389389
contexts = itertools.chain(
390390
extra_contexts, oldc.diff(
391-
newc, color='never',create_patch=True, U=context))
391+
newc, color='never', create_patch=True, unified=context))
392392
for diff_context in contexts:
393393
# Each iteration of this is a file
394394
f = DiffFile()

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ pbr>=0.11,<2.0
22

33
urwid>=1.2.1,!=1.3.0
44
SQLAlchemy>=1.0.4
5-
GitPython>=0.3.7,<1.0.2
5+
GitPython>=0.3.7
66
python-dateutil
77
requests>=2.5.3,<3.0.0
88
ordereddict

0 commit comments

Comments
 (0)