diff options
| author | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2014-01-22 14:26:49 +0200 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2014-03-27 20:29:00 +0100 |
| commit | d8f55da007637de916c6ab067ebd22f2227e3aa0 (patch) | |
| tree | 3343c53919709e13e15651e110f9f379fa8ec328 | |
| parent | 3808523fd640d12b7e17f5b3ca443c5478283023 (diff) | |
GitRepository/get_commit_info: correctly handle file renames/copies
Use the '--no-renames' git command line option in order to prevent two
filenames per entry.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
| -rw-r--r-- | gbp/git/repository.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gbp/git/repository.py b/gbp/git/repository.py index 7e0b329..10b9030 100644 --- a/gbp/git/repository.py +++ b/gbp/git/repository.py @@ -1529,7 +1529,8 @@ class GitRepository(object): """ commit_sha1 = self.rev_parse("%s^0" % commitish) args = GitArgs('--pretty=format:%an%x00%ae%x00%ad%x00%cn%x00%ce%x00%cd%x00%s%x00%f%x00%b%x00', - '-z', '--date=raw', '--name-status', commit_sha1) + '-z', '--date=raw', '--no-renames', '--name-status', + commit_sha1) out, err, ret = self._git_inout('show', args.args) if ret: raise GitRepositoryError("Unable to retrieve commit info for %s" |