From: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Date: Wed, 22 Jan 2014 12:26:49 +0000 (+0200)
Subject: GitRepository/get_commit_info: correctly handle file renames/copies
X-Git-Tag: debian/0.6.11~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d8f55da007637de916c6ab067ebd22f2227e3aa0;p=tools%2Fgit-buildpackage.git

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>
---

diff --git a/gbp/git/repository.py b/gbp/git/repository.py
index 7e0b3299..10b90308 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"