diff options
| author | Toopy <toopy@users.noreply.github.com> | 2016-09-20 16:50:42 +0200 |
|---|---|---|
| committer | Adrian Likins <alikins@redhat.com> | 2016-09-20 10:50:42 -0400 |
| commit | 6fbd72db82512479410ad578a694e62324ecc802 (patch) | |
| tree | 733be93aaaa41e06fa26e62b6be34d47a11eae78 | |
| parent | a49cd08832a4a948920297b628f6c255d5c6a498 (diff) | |
| download | ansible-modules-core-6fbd72db82512479410ad578a694e62324ecc802.tar.gz | |
Fix git get_diff TypeError when fetch (#4881)
| -rw-r--r-- | source_control/git.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source_control/git.py b/source_control/git.py index 5c561840..8b85df27 100644 --- a/source_control/git.py +++ b/source_control/git.py @@ -424,7 +424,8 @@ def get_diff(module, git_path, dest, repo, remote, depth, bare, before, after): return { 'prepared': '>> Newly checked out %s' % after } elif before != after: # Ensure we have the object we are referring to during git diff ! - fetch(git_path, module, repo, dest, after, remote, depth, bare, '') + 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) if rc == 0 and out: |