summaryrefslogtreecommitdiff
path: root/git/repo/base.py
diff options
context:
space:
mode:
authorVincent Driessen <me@nvie.com>2016-04-13 16:02:05 +0200
committerVincent Driessen <me@nvie.com>2016-04-13 16:44:17 +0200
commitf533a68cb5295f912da05e061a0b9bca05b3f0c8 (patch)
tree54b7d186f06cfd79336acc6136385f233d963b15 /git/repo/base.py
parente5b8220a1a967abdf2bae2124e3e22a9eea3729f (diff)
downloadgitpython-f533a68cb5295f912da05e061a0b9bca05b3f0c8.tar.gz
Allow passing args to git-blame
This can be used to pass options like -C or -M.
Diffstat (limited to 'git/repo/base.py')
-rw-r--r--git/repo/base.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/git/repo/base.py b/git/repo/base.py
index 64374f80..9d013230 100644
--- a/git/repo/base.py
+++ b/git/repo/base.py
@@ -714,7 +714,7 @@ class Repo(object):
yield commits[hexsha], range(lineno, lineno + num_lines)
- def blame(self, rev, file, incremental=False):
+ def blame(self, rev, file, incremental=False, **kwargs):
"""The blame information for the given file at the given revision.
:parm rev: revision specifier, see git-rev-parse for viable options.
@@ -724,9 +724,9 @@ class Repo(object):
changed within the given commit. The Commit objects will be given in order
of appearance."""
if incremental:
- return self.blame_incremental(rev, file)
+ return self.blame_incremental(rev, file, **kwargs)
- data = self.git.blame(rev, '--', file, p=True, stdout_as_string=False)
+ data = self.git.blame(rev, '--', file, p=True, stdout_as_string=False, **kwargs)
commits = dict()
blames = list()
info = None