From e3212028be6343dd865a23e397ffcc1a0e9e9b67 Mon Sep 17 00:00:00 2001 From: David Shrewsbury Date: Tue, 8 Mar 2016 14:02:26 -0500 Subject: [PATCH] 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 --- gertty/gitrepo.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gertty/gitrepo.py b/gertty/gitrepo.py index 59e4616..ec5ace6 100644 --- a/gertty/gitrepo.py +++ b/gertty/gitrepo.py @@ -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()