Make skia recipes explicitly set GIT_MODE

scripts/slave/recipes/skia/swarm_trigger.expected/Wrong_downloaded_SKP_VERSION.json

Index: scripts/slave/recipes/skia/swarm_trigger.expected/Wrong_downloaded_SKP_VERSION.json
diff --git a/scripts/slave/recipes/skia/swarm_trigger.expected/Wrong_downloaded_SKP_VERSION.json b/scripts/slave/recipes/skia/swarm_trigger.expected/Wrong_downloaded_SKP_VERSION.json
index ec6fc6e74e914a271927b95874936fecd14b03b3..f2c02a38a4c62d6ba63fa8fbf679659c2728f38f 100644
--- a/scripts/slave/recipes/skia/swarm_trigger.expected/Wrong_downloaded_SKP_VERSION.json
+++ b/scripts/slave/recipes/skia/swarm_trigger.expected/Wrong_downloaded_SKP_VERSION.json
@@ -45,7 +45,7 @@
       "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
       "config",
       "--spec",
-      "cache_dir = None\nsolutions = [{'deps_file': 'DEPS', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]\ntarget_os = ['llvm']"
+      "cache_dir = None\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]\ntarget_os = ['llvm']"
     ],
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
@@ -58,9 +58,14 @@
       "-u",
       "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
       "sync",
+      "--verbose",
+      "--with_branch_heads",
       "--nohooks",
+      "-j8",
+      "--reset",
       "--force",
-      "--verbose",
+      "--upstream",
+      "--no-nag-max",
       "--delete_unversioned_trees",
       "--revision",
       "skia@abc123",
@@ -75,18 +80,50 @@
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"solutions\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"skia/\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"revision\": 164710@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"revision\": \"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@",
       "@@@STEP_LOG_LINE@json.output@    }@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
       "@@@STEP_LOG_LINE@json.output@}@@@",
       "@@@STEP_LOG_END@json.output@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@164710@@@"
+      "@@@SET_BUILD_PROPERTY@got_revision@\"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
+      "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
+      "recurse",
+      "git",
+      "config",
+      "user.name",
+      "local_bot"
+    ],
+    "env": {
+      "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
+    },
+    "name": "gclient recurse (git config user.name)"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
+      "recurse",
+      "git",
+      "config",
+      "user.email",
+      "local_bot@example.com"
+    ],
+    "env": {
+      "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
+    },
+    "name": "gclient recurse (git config user.email)"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
       "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
       "--path",
       "[SLAVE_BUILD]/swarming.client",
@@ -596,7 +633,7 @@
       "slavename=skiabot-dummy-compile-slave",
       "reason=Triggered by Skia swarm_trigger Recipe",
       "swarm_out_dir=${ISOLATED_OUTDIR}",
-      "revision=164710"
+      "revision=9046e2e693bb92a76e972b694580e5d17ad10748"
     ],
     "name": "[trigger] compile_skia on Ubuntu",
     "~followup_annotations": [
@@ -973,7 +1010,7 @@
       "slavename=skiabot-linux-test-000",
       "reason=Triggered by Skia swarm_trigger Recipe",
       "swarm_out_dir=${ISOLATED_OUTDIR}",
-      "revision=164710"
+      "revision=9046e2e693bb92a76e972b694580e5d17ad10748"
     ],
     "name": "[trigger] test_skia on Ubuntu",
     "~followup_annotations": [
@@ -1152,7 +1189,7 @@
       "slavename=skiabot-linux-test-000",
       "reason=Triggered by Skia swarm_trigger Recipe",
       "swarm_out_dir=${ISOLATED_OUTDIR}",
-      "revision=164710"
+      "revision=9046e2e693bb92a76e972b694580e5d17ad10748"
     ],
     "name": "[trigger] perf_skia on Ubuntu",
     "~followup_annotations": [
@@ -1288,7 +1325,7 @@
       "-u",
       "RECIPE_MODULE[build::skia]/resources/upload_dm_results.py",
       "[SLAVE_BUILD]/dm",
-      "164710",
+      "9046e2e693bb92a76e972b694580e5d17ad10748",
       "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug",
       "5",
       "",