GitRepository/get_commit_info: correctly handle file renames/copies
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>
Wed, 22 Jan 2014 12:26:49 +0000 (14:26 +0200)
committerGuido Günther <agx@sigxcpu.org>
Thu, 27 Mar 2014 19:29:00 +0000 (20:29 +0100)
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>
gbp/git/repository.py

index 7e0b329980547bc17f7ee8bc3adaf7eff09f298f..10b903088fd844d45ec9f842f511b3259dfc18fb 100644 (file)
@@ -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"