Merge 58f60891a1 into 6aa8192131

changelogs/fragments/82820-git-diff-encoding.yml

@@ -0,0 +1,2 @@
+bugfixes:
+- git - Address non-UTF8 module responses in the ``diff`` parameter with repositories that contain non-UTF8 encoded data

lib/ansible/modules/git.py

@@ -671,7 +671,9 @@ def get_diff(module, git_path, dest, repo, remote, depth, bare, before, after):
         git_version_used = git_version(git_path, module)
         fetch(git_path, module, repo, dest, after, remote, depth, bare, '', git_version_used)
         cmd = '%s diff %s %s' % (git_path, before, after)
-        (rc, out, err) = module.run_command(cmd, cwd=dest)
+        # The actual file encodings in the repo may not be easily discernible, to avoid encoding issues later,
+        # replace chars that are not utf-8 encodable
+        (rc, out, err) = module.run_command(cmd, cwd=dest, errors='replace')
         if rc == 0 and out:
             return {'prepared': out}
         elif rc == 0: