diff options
| author | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2012-11-29 19:17:59 +0200 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2013-06-13 20:45:15 +0200 |
| commit | 75cbd9af3f63adbbaaa04187e749583be89a17e2 (patch) | |
| tree | 7b946ca09ec0ff4a1b7e18721ea899ecf9008413 /gbp/git | |
| parent | 18bc529ef0e4913574b5d4d3d15ed35cf8cadff2 (diff) | |
GitRepository/diff: allow single object
Allow diffing a single object, e.g. getting diff from single commit.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Diffstat (limited to 'gbp/git')
| -rw-r--r-- | gbp/git/repository.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gbp/git/repository.py b/gbp/git/repository.py index 61c825d..5d7e38c 100644 --- a/gbp/git/repository.py +++ b/gbp/git/repository.py @@ -1449,7 +1449,7 @@ class GitRepository(object): args.append(patch) self._git_command("apply", args) - def diff(self, obj1, obj2, paths=None): + def diff(self, obj1, obj2=None, paths=None): """ Diff two git repository objects @@ -1462,7 +1462,9 @@ class GitRepository(object): @return: diff @rtype: C{str} """ - options = GitArgs(obj1, obj2) + options = GitArgs() + options.add(obj1) + options.add_true(obj2, obj2) if paths: options.add('--', paths) output, stderr, ret = self._git_inout('diff', options.args) |