From 8f7c8ef3a5f49ae7e625a5ac8c793619666974d2 Mon Sep 17 00:00:00 2001
From: Robin Roth <robin@rroth.de>
Date: Mon, 5 Jun 2017 06:10:22 +0200
Subject: [PATCH] Reenable git tests (#25341)

* Revert "Temporarily disable failing git test."
* Use correct hash for depth=1 test
---
 test/integration/targets/git/tasks/main.yml        |  2 +-
 .../targets/git/tasks/specific-revision.yml        | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/test/integration/targets/git/tasks/main.yml b/test/integration/targets/git/tasks/main.yml
index 1d0df38afb7..bc87aeb810c 100644
--- a/test/integration/targets/git/tasks/main.yml
+++ b/test/integration/targets/git/tasks/main.yml
@@ -22,7 +22,7 @@
 - include: formats.yml
 - include: missing_hostkey.yml
 - include: no-destination.yml
-#- include: specific-revision.yml
+- include: specific-revision.yml
 - include: submodules.yml
 - include: change-repo-url.yml
 - include: depth.yml
diff --git a/test/integration/targets/git/tasks/specific-revision.yml b/test/integration/targets/git/tasks/specific-revision.yml
index 0ca9f4b216a..4daa0b1b249 100644
--- a/test/integration/targets/git/tasks/specific-revision.yml
+++ b/test/integration/targets/git/tasks/specific-revision.yml
@@ -50,7 +50,7 @@
   git:
     repo: "{{ repo_dir }}/format1"
     dest: "{{ checkout_dir }}"
-    version: 2cfde3668b8bb10fbe2b9d5cec486025ad8cc51b
+    version: 5473e343e33255f2da0b160f53135c56921d875c
   ignore_errors: true
   register: git_result
 
@@ -64,7 +64,7 @@
   git:
     repo: https://github.com/ansible/ansible-examples.git
     dest: '{{ checkout_dir }}'
-    version: 2cfde3668b8bb10fbe2b9d5cec486025ad8cc51b
+    version: 5473e343e33255f2da0b160f53135c56921d875c
     refspec: refs/pull/7/merge
 
 - name: check HEAD after update with refspec
@@ -75,7 +75,7 @@
 
 - assert:
     that:
-      - 'git_result.stdout == "2cfde3668b8bb10fbe2b9d5cec486025ad8cc51b"'
+      - 'git_result.stdout == "5473e343e33255f2da0b160f53135c56921d875c"'
 
 # try out combination of refspec and depth
 - name: clear checkout_dir
@@ -87,7 +87,7 @@
   git:
     repo: https://github.com/ansible/ansible-examples.git
     dest: '{{ checkout_dir }}'
-    version: 2cfde3668b8bb10fbe2b9d5cec486025ad8cc51b
+    version: 5473e343e33255f2da0b160f53135c56921d875c
     refspec: refs/pull/7/merge
     depth: 1
 
@@ -99,7 +99,7 @@
 
 - assert:
     that:
-      - 'git_result.stdout == "2cfde3668b8bb10fbe2b9d5cec486025ad8cc51b"'
+      - 'git_result.stdout == "5473e343e33255f2da0b160f53135c56921d875c"'
 
 - name: try to access other commit
   shell: git checkout 0ce1096
@@ -124,7 +124,7 @@
   git:
     repo: https://github.com/ansible/ansible-examples.git
     dest: '{{ checkout_dir }}'
-    version: 2cfde3668b8bb10fbe2b9d5cec486025ad8cc51b
+    version: 5473e343e33255f2da0b160f53135c56921d875c
     refspec: refs/pull/7/merge
 
 - name: check HEAD after update with refspec
@@ -135,7 +135,7 @@
 
 - assert:
     that:
-      - 'git_result.stdout == "2cfde3668b8bb10fbe2b9d5cec486025ad8cc51b"'
+      - 'git_result.stdout == "5473e343e33255f2da0b160f53135c56921d875c"'
 
 # Test that a forced shallow checkout referincing branch only always fetches latest head