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

Commit e321202

Browse files
David ShrewsburyJames E. Blair
David Shrewsbury
authored and
James E. Blair
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 9b93160 commit e321202

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

gertty/gitrepo.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ def diff(self, old, new, context=10000, show_old_commit=False):
381381
extra_contexts.append(CommitContext(None, newc))
382382
contexts = itertools.chain(
383383
extra_contexts, oldc.diff(
384-
newc, color='never',create_patch=True, U=context))
384+
newc, color='never', create_patch=True, unified=context))
385385
for diff_context in contexts:
386386
# Each iteration of this is a file
387387
f = DiffFile()

0 commit comments

Comments
 (0)