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:

https://github.com/gitpython-developers/GitPython/issues/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
This commit is contained in:
David Shrewsbury 2016-03-08 14:02:26 -05:00 committed by James E. Blair
parent 9b931602a6
commit e3212028be
1 changed files with 1 additions and 1 deletions

View File

@ -381,7 +381,7 @@ class Repo(object):
extra_contexts.append(CommitContext(None, newc))
contexts = itertools.chain(
extra_contexts, oldc.diff(
newc, color='never',create_patch=True, U=context))
newc, color='never', create_patch=True, unified=context))
for diff_context in contexts:
# Each iteration of this is a file
f = DiffFile()