Roll recipe dependencies (nontrivial).

This is an automated CL created by the recipe roller. This CL rolls
recipe changes from upstream projects (fuchsia) into this repository.

The build that created this CL was
https://ci.chromium.org/b/8824176004408380513

Please review the expectation changes, and LGTM+CQ.

fuchsia:
https://fuchsia.googlesource.com/infra/recipes/+/f699e21ee94a07a0bbe713d31cfe517886977a3f
  f699e21 (olivernewman@google.com)
      [cache] Include cache name in guard file step names

More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug.

R=mohrr@google.com, tpudlik@google.com

Recipe-Tryjob-Bypass-Reason: Autoroller
Bugdroid-Send-Email: False
Change-Id: Ib1c01685fc2f223db035d9d8768a8ce51ab03414
Reviewed-on: https://pigweed-review.googlesource.com/c/infra/recipes/+/81180
Reviewed-by: Ted Pudlik <tpudlik@google.com>
Commit-Queue: Ted Pudlik <tpudlik@google.com>
diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg
index 0d5c0a5..41838b0 100644
--- a/infra/config/recipes.cfg
+++ b/infra/config/recipes.cfg
@@ -21,7 +21,7 @@
   "deps": {
     "fuchsia": {
       "branch": "refs/heads/main",
-      "revision": "90105e5e4e37b0441c8dde538df54a55f79b3d22",
+      "revision": "f699e21ee94a07a0bbe713d31cfe517886977a3f",
       "url": "https://fuchsia.googlesource.com/infra/recipes"
     },
     "recipe_engine": {
diff --git a/recipe_modules/checkout/tests/git.expected/ci.json b/recipe_modules/checkout/tests/git.expected/ci.json
index cbb62d0..8fb89f7 100644
--- a/recipe_modules/checkout/tests/git.expected/ci.json
+++ b/recipe_modules/checkout/tests/git.expected/ci.json
@@ -339,7 +339,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.write guard file",
+    "name": "checkout pigweed.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -599,7 +599,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.remove guard file",
+    "name": "checkout pigweed.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipe_modules/checkout/tests/git.expected/no_props.json b/recipe_modules/checkout/tests/git.expected/no_props.json
index b966671..83ffbd0 100644
--- a/recipe_modules/checkout/tests/git.expected/no_props.json
+++ b/recipe_modules/checkout/tests/git.expected/no_props.json
@@ -550,7 +550,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout.cache.write guard file",
+    "name": "checkout.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -810,7 +810,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout.cache.remove guard file",
+    "name": "checkout.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipe_modules/checkout/tests/git.expected/not_in_gerrit.json b/recipe_modules/checkout/tests/git.expected/not_in_gerrit.json
index c9f041f..daf97fb 100644
--- a/recipe_modules/checkout/tests/git.expected/not_in_gerrit.json
+++ b/recipe_modules/checkout/tests/git.expected/not_in_gerrit.json
@@ -235,7 +235,7 @@
     ],
     "cwd": "[START_DIR]/checkout",
     "infra_step": true,
-    "name": "checkout pigweed.cache.write guard file",
+    "name": "checkout pigweed.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -387,7 +387,7 @@
     ],
     "cwd": "[START_DIR]/checkout",
     "infra_step": true,
-    "name": "checkout pigweed.cache.remove guard file",
+    "name": "checkout pigweed.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipe_modules/checkout/tests/git.expected/other.json b/recipe_modules/checkout/tests/git.expected/other.json
index 1208eb5..4ee310a 100644
--- a/recipe_modules/checkout/tests/git.expected/other.json
+++ b/recipe_modules/checkout/tests/git.expected/other.json
@@ -240,7 +240,7 @@
     ],
     "cwd": "[START_DIR]/checkout",
     "infra_step": true,
-    "name": "checkout pigweed.cache.write guard file",
+    "name": "checkout pigweed.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -392,7 +392,7 @@
     ],
     "cwd": "[START_DIR]/checkout",
     "infra_step": true,
-    "name": "checkout pigweed.cache.remove guard file",
+    "name": "checkout pigweed.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipe_modules/checkout/tests/git.expected/try.json b/recipe_modules/checkout/tests/git.expected/try.json
index fd7cbd1..bcb0d68 100644
--- a/recipe_modules/checkout/tests/git.expected/try.json
+++ b/recipe_modules/checkout/tests/git.expected/try.json
@@ -551,7 +551,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.write guard file",
+    "name": "checkout pigweed.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -811,7 +811,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.remove guard file",
+    "name": "checkout pigweed.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-ci.json b/recipe_modules/checkout/tests/submodule.expected/submodule-ci.json
index 9c088bb..81327ef 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-ci.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-ci.json
@@ -339,7 +339,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.write guard file",
+    "name": "checkout pigweed.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -599,7 +599,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.remove guard file",
+    "name": "checkout pigweed.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-try-equivalent.json b/recipe_modules/checkout/tests/submodule.expected/submodule-try-equivalent.json
index 249e172..7c301e3 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-try-equivalent.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-try-equivalent.json
@@ -550,7 +550,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.write guard file",
+    "name": "checkout pigweed.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -810,7 +810,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.remove guard file",
+    "name": "checkout pigweed.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-try-gibberish.json b/recipe_modules/checkout/tests/submodule.expected/submodule-try-gibberish.json
index 374cc19..03c6b21 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-try-gibberish.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-try-gibberish.json
@@ -550,7 +550,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.write guard file",
+    "name": "checkout pigweed.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -810,7 +810,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.remove guard file",
+    "name": "checkout pigweed.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-cqdeps.json b/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-cqdeps.json
index 539746c..ca323cf 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-cqdeps.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-cqdeps.json
@@ -1036,7 +1036,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.write guard file",
+    "name": "checkout pigweed.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1296,7 +1296,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.remove guard file",
+    "name": "checkout pigweed.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-one-missing-one-forbidden-cqdeps.json b/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-one-missing-one-forbidden-cqdeps.json
index b07c1bc..3f1e592 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-one-missing-one-forbidden-cqdeps.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-one-missing-one-forbidden-cqdeps.json
@@ -1135,7 +1135,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.write guard file",
+    "name": "checkout pigweed.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1395,7 +1395,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.remove guard file",
+    "name": "checkout pigweed.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-one-missing.json b/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-one-missing.json
index c4b484f..5ecd192 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-one-missing.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-one-missing.json
@@ -691,7 +691,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.write guard file",
+    "name": "checkout pigweed.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -951,7 +951,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.remove guard file",
+    "name": "checkout pigweed.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple.json b/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple.json
index 0f15ef0..e58a8b4 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple.json
@@ -690,7 +690,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.write guard file",
+    "name": "checkout pigweed.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -950,7 +950,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.remove guard file",
+    "name": "checkout pigweed.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-try-not-found.json b/recipe_modules/checkout/tests/submodule.expected/submodule-try-not-found.json
index 2b31746..30afe7d 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-try-not-found.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-try-not-found.json
@@ -550,7 +550,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.write guard file",
+    "name": "checkout pigweed.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -810,7 +810,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.remove guard file",
+    "name": "checkout pigweed.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-try.json b/recipe_modules/checkout/tests/submodule.expected/submodule-try.json
index 4038c47..0caa40c 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-try.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-try.json
@@ -550,7 +550,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.write guard file",
+    "name": "checkout pigweed.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -810,7 +810,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.remove guard file",
+    "name": "checkout pigweed.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipes/build.expected/basic.json b/recipes/build.expected/basic.json
index 68494d7..bd3eb5f 100644
--- a/recipes/build.expected/basic.json
+++ b/recipes/build.expected/basic.json
@@ -339,7 +339,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout.cache.write guard file",
+    "name": "checkout.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -599,7 +599,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout.cache.remove guard file",
+    "name": "checkout.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipes/cipd_roller.expected/bad_package_spec.json b/recipes/cipd_roller.expected/bad_package_spec.json
index 73d2993..d4037a0 100644
--- a/recipes/cipd_roller.expected/bad_package_spec.json
+++ b/recipes/cipd_roller.expected/bad_package_spec.json
@@ -145,7 +145,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.write guard file",
+    "name": "checkout pigweed.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -405,7 +405,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.remove guard file",
+    "name": "checkout pigweed.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipes/cipd_roller.expected/missing_tag.json b/recipes/cipd_roller.expected/missing_tag.json
index e7628e3..324097f 100644
--- a/recipes/cipd_roller.expected/missing_tag.json
+++ b/recipes/cipd_roller.expected/missing_tag.json
@@ -145,7 +145,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.write guard file",
+    "name": "checkout pigweed.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -405,7 +405,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.remove guard file",
+    "name": "checkout pigweed.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipes/cipd_roller.expected/multiple_common_tags.json b/recipes/cipd_roller.expected/multiple_common_tags.json
index b0a749e..fe539aa 100644
--- a/recipes/cipd_roller.expected/multiple_common_tags.json
+++ b/recipes/cipd_roller.expected/multiple_common_tags.json
@@ -145,7 +145,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.write guard file",
+    "name": "checkout pigweed.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -405,7 +405,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.remove guard file",
+    "name": "checkout pigweed.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipes/cipd_roller.expected/no_common_tags.json b/recipes/cipd_roller.expected/no_common_tags.json
index f777be7..d18fc1f 100644
--- a/recipes/cipd_roller.expected/no_common_tags.json
+++ b/recipes/cipd_roller.expected/no_common_tags.json
@@ -145,7 +145,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.write guard file",
+    "name": "checkout pigweed.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -405,7 +405,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.remove guard file",
+    "name": "checkout pigweed.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipes/cipd_roller.expected/no_common_tags_and_relaxing_ref_mismatch_does_not_help.json b/recipes/cipd_roller.expected/no_common_tags_and_relaxing_ref_mismatch_does_not_help.json
index 1258943..2295014 100644
--- a/recipes/cipd_roller.expected/no_common_tags_and_relaxing_ref_mismatch_does_not_help.json
+++ b/recipes/cipd_roller.expected/no_common_tags_and_relaxing_ref_mismatch_does_not_help.json
@@ -145,7 +145,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.write guard file",
+    "name": "checkout pigweed.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -405,7 +405,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.remove guard file",
+    "name": "checkout pigweed.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipes/cipd_roller.expected/no_common_tags_but_relaxing_ref_mismatch_helps.json b/recipes/cipd_roller.expected/no_common_tags_but_relaxing_ref_mismatch_helps.json
index df33b86..0485bc8 100644
--- a/recipes/cipd_roller.expected/no_common_tags_but_relaxing_ref_mismatch_helps.json
+++ b/recipes/cipd_roller.expected/no_common_tags_but_relaxing_ref_mismatch_helps.json
@@ -145,7 +145,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.write guard file",
+    "name": "checkout pigweed.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -405,7 +405,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.remove guard file",
+    "name": "checkout pigweed.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipes/cipd_roller.expected/no_curlies_in_spec.json b/recipes/cipd_roller.expected/no_curlies_in_spec.json
index bad2335..4358e90 100644
--- a/recipes/cipd_roller.expected/no_curlies_in_spec.json
+++ b/recipes/cipd_roller.expected/no_curlies_in_spec.json
@@ -145,7 +145,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.write guard file",
+    "name": "checkout pigweed.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -405,7 +405,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.remove guard file",
+    "name": "checkout pigweed.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipes/cipd_roller.expected/platform-independent.json b/recipes/cipd_roller.expected/platform-independent.json
index e1510a2..53d301d 100644
--- a/recipes/cipd_roller.expected/platform-independent.json
+++ b/recipes/cipd_roller.expected/platform-independent.json
@@ -145,7 +145,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.write guard file",
+    "name": "checkout pigweed.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -405,7 +405,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.remove guard file",
+    "name": "checkout pigweed.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipes/cipd_roller.expected/success.json b/recipes/cipd_roller.expected/success.json
index c85cb7f..d8aa804 100644
--- a/recipes/cipd_roller.expected/success.json
+++ b/recipes/cipd_roller.expected/success.json
@@ -145,7 +145,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.write guard file",
+    "name": "checkout pigweed.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -405,7 +405,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.remove guard file",
+    "name": "checkout pigweed.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipes/docs_builder.expected/docs.json b/recipes/docs_builder.expected/docs.json
index e232e85..8823f99 100644
--- a/recipes/docs_builder.expected/docs.json
+++ b/recipes/docs_builder.expected/docs.json
@@ -240,7 +240,7 @@
     ],
     "cwd": "[START_DIR]/checkout",
     "infra_step": true,
-    "name": "checkout pigweed.cache.write guard file",
+    "name": "checkout pigweed.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -392,7 +392,7 @@
     ],
     "cwd": "[START_DIR]/checkout",
     "infra_step": true,
-    "name": "checkout pigweed.cache.remove guard file",
+    "name": "checkout pigweed.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipes/docs_builder.expected/docs_dry_run.json b/recipes/docs_builder.expected/docs_dry_run.json
index aacd135..4e4e8d9 100644
--- a/recipes/docs_builder.expected/docs_dry_run.json
+++ b/recipes/docs_builder.expected/docs_dry_run.json
@@ -240,7 +240,7 @@
     ],
     "cwd": "[START_DIR]/checkout",
     "infra_step": true,
-    "name": "checkout pigweed.cache.write guard file",
+    "name": "checkout pigweed.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -392,7 +392,7 @@
     ],
     "cwd": "[START_DIR]/checkout",
     "infra_step": true,
-    "name": "checkout pigweed.cache.remove guard file",
+    "name": "checkout pigweed.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipes/envtest.expected/environment_variables.json b/recipes/envtest.expected/environment_variables.json
index 22c3e1e..2b793ad 100644
--- a/recipes/envtest.expected/environment_variables.json
+++ b/recipes/envtest.expected/environment_variables.json
@@ -240,7 +240,7 @@
     ],
     "cwd": "[START_DIR]/checkout",
     "infra_step": true,
-    "name": "checkout pigweed.cache.write guard file",
+    "name": "checkout pigweed.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -392,7 +392,7 @@
     ],
     "cwd": "[START_DIR]/checkout",
     "infra_step": true,
-    "name": "checkout pigweed.cache.remove guard file",
+    "name": "checkout pigweed.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipes/envtest.expected/fail.json b/recipes/envtest.expected/fail.json
index 632fd1e..0bd760c 100644
--- a/recipes/envtest.expected/fail.json
+++ b/recipes/envtest.expected/fail.json
@@ -339,7 +339,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.write guard file",
+    "name": "checkout pigweed.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -599,7 +599,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.remove guard file",
+    "name": "checkout pigweed.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipes/envtest.expected/pigweed.json b/recipes/envtest.expected/pigweed.json
index 56796e7..687196b 100644
--- a/recipes/envtest.expected/pigweed.json
+++ b/recipes/envtest.expected/pigweed.json
@@ -339,7 +339,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.write guard file",
+    "name": "checkout pigweed.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -599,7 +599,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.remove guard file",
+    "name": "checkout pigweed.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipes/envtest.expected/windows.json b/recipes/envtest.expected/windows.json
index 61afe62..9ffdb17 100644
--- a/recipes/envtest.expected/windows.json
+++ b/recipes/envtest.expected/windows.json
@@ -339,7 +339,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.write guard file",
+    "name": "checkout pigweed.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -599,7 +599,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.remove guard file",
+    "name": "checkout pigweed.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipes/luci_config.expected/starlark.json b/recipes/luci_config.expected/starlark.json
index 49d74ae..cd8e85d 100644
--- a/recipes/luci_config.expected/starlark.json
+++ b/recipes/luci_config.expected/starlark.json
@@ -550,7 +550,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.write guard file",
+    "name": "checkout pigweed.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -810,7 +810,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.remove guard file",
+    "name": "checkout pigweed.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipes/multiple_submodule_roller.expected/missing.json b/recipes/multiple_submodule_roller.expected/missing.json
index 9f70b7b..4e8718a 100644
--- a/recipes/multiple_submodule_roller.expected/missing.json
+++ b/recipes/multiple_submodule_roller.expected/missing.json
@@ -85,7 +85,7 @@
     ],
     "cwd": "[START_DIR]/checkout",
     "infra_step": true,
-    "name": "checkout pigweed.cache.write guard file",
+    "name": "checkout pigweed.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -237,7 +237,7 @@
     ],
     "cwd": "[START_DIR]/checkout",
     "infra_step": true,
-    "name": "checkout pigweed.cache.remove guard file",
+    "name": "checkout pigweed.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipes/multiple_submodule_roller.expected/noop.json b/recipes/multiple_submodule_roller.expected/noop.json
index a854912..86173b8 100644
--- a/recipes/multiple_submodule_roller.expected/noop.json
+++ b/recipes/multiple_submodule_roller.expected/noop.json
@@ -85,7 +85,7 @@
     ],
     "cwd": "[START_DIR]/checkout",
     "infra_step": true,
-    "name": "checkout pigweed.cache.write guard file",
+    "name": "checkout pigweed.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -237,7 +237,7 @@
     ],
     "cwd": "[START_DIR]/checkout",
     "infra_step": true,
-    "name": "checkout pigweed.cache.remove guard file",
+    "name": "checkout pigweed.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipes/multiple_submodule_roller.expected/partial_noop.json b/recipes/multiple_submodule_roller.expected/partial_noop.json
index 1d56dc4..27b24e9 100644
--- a/recipes/multiple_submodule_roller.expected/partial_noop.json
+++ b/recipes/multiple_submodule_roller.expected/partial_noop.json
@@ -85,7 +85,7 @@
     ],
     "cwd": "[START_DIR]/checkout",
     "infra_step": true,
-    "name": "checkout pigweed.cache.write guard file",
+    "name": "checkout pigweed.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -237,7 +237,7 @@
     ],
     "cwd": "[START_DIR]/checkout",
     "infra_step": true,
-    "name": "checkout pigweed.cache.remove guard file",
+    "name": "checkout pigweed.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipes/multiple_submodule_roller.expected/success.json b/recipes/multiple_submodule_roller.expected/success.json
index e09b2cc..85173f8 100644
--- a/recipes/multiple_submodule_roller.expected/success.json
+++ b/recipes/multiple_submodule_roller.expected/success.json
@@ -85,7 +85,7 @@
     ],
     "cwd": "[START_DIR]/checkout",
     "infra_step": true,
-    "name": "checkout pigweed.cache.write guard file",
+    "name": "checkout pigweed.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -237,7 +237,7 @@
     ],
     "cwd": "[START_DIR]/checkout",
     "infra_step": true,
-    "name": "checkout pigweed.cache.remove guard file",
+    "name": "checkout pigweed.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipes/pw_presubmit.expected/sign-nobuildid.json b/recipes/pw_presubmit.expected/sign-nobuildid.json
index 2eeb5b5..9343c31 100644
--- a/recipes/pw_presubmit.expected/sign-nobuildid.json
+++ b/recipes/pw_presubmit.expected/sign-nobuildid.json
@@ -339,7 +339,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.write guard file",
+    "name": "checkout pigweed.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -599,7 +599,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.remove guard file",
+    "name": "checkout pigweed.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipes/pw_presubmit.expected/sign.json b/recipes/pw_presubmit.expected/sign.json
index e7247dc..7b26919 100644
--- a/recipes/pw_presubmit.expected/sign.json
+++ b/recipes/pw_presubmit.expected/sign.json
@@ -339,7 +339,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.write guard file",
+    "name": "checkout pigweed.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -599,7 +599,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.remove guard file",
+    "name": "checkout pigweed.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipes/pw_presubmit.expected/step.json b/recipes/pw_presubmit.expected/step.json
index 86f25c3..2a8630e 100644
--- a/recipes/pw_presubmit.expected/step.json
+++ b/recipes/pw_presubmit.expected/step.json
@@ -550,7 +550,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.write guard file",
+    "name": "checkout pigweed.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -810,7 +810,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.remove guard file",
+    "name": "checkout pigweed.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipes/recipes.expected/cq_try.json b/recipes/recipes.expected/cq_try.json
index 151b3bf..abe9bd2 100644
--- a/recipes/recipes.expected/cq_try.json
+++ b/recipes/recipes.expected/cq_try.json
@@ -550,7 +550,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.write guard file",
+    "name": "checkout pigweed.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -810,7 +810,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.remove guard file",
+    "name": "checkout pigweed.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipes/repo_roller.expected/backwards.json b/recipes/repo_roller.expected/backwards.json
index bc0fd0e..356a3a3 100644
--- a/recipes/repo_roller.expected/backwards.json
+++ b/recipes/repo_roller.expected/backwards.json
@@ -145,7 +145,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout manifest.cache.write guard file",
+    "name": "checkout manifest.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -405,7 +405,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout manifest.cache.remove guard file",
+    "name": "checkout manifest.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -963,7 +963,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout a.cache.write guard file",
+    "name": "checkout a.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1223,7 +1223,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout a.cache.remove guard file",
+    "name": "checkout a.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipes/repo_roller.expected/dotdot-prefix.json b/recipes/repo_roller.expected/dotdot-prefix.json
index a755658..ec2fddc 100644
--- a/recipes/repo_roller.expected/dotdot-prefix.json
+++ b/recipes/repo_roller.expected/dotdot-prefix.json
@@ -145,7 +145,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout manifest.cache.write guard file",
+    "name": "checkout manifest.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -405,7 +405,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout manifest.cache.remove guard file",
+    "name": "checkout manifest.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -963,7 +963,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout g.cache.write guard file",
+    "name": "checkout g.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1223,7 +1223,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout g.cache.remove guard file",
+    "name": "checkout g.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipes/repo_roller.expected/equivalent.json b/recipes/repo_roller.expected/equivalent.json
index f4e3e1b..9a599ea 100644
--- a/recipes/repo_roller.expected/equivalent.json
+++ b/recipes/repo_roller.expected/equivalent.json
@@ -145,7 +145,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout manifest.cache.write guard file",
+    "name": "checkout manifest.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -405,7 +405,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout manifest.cache.remove guard file",
+    "name": "checkout manifest.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -963,7 +963,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout b.cache.write guard file",
+    "name": "checkout b.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1223,7 +1223,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout b.cache.remove guard file",
+    "name": "checkout b.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipes/repo_roller.expected/host-dot-dot.json b/recipes/repo_roller.expected/host-dot-dot.json
index ae6d674..3425e92 100644
--- a/recipes/repo_roller.expected/host-dot-dot.json
+++ b/recipes/repo_roller.expected/host-dot-dot.json
@@ -145,7 +145,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout manifest.cache.write guard file",
+    "name": "checkout manifest.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -405,7 +405,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout manifest.cache.remove guard file",
+    "name": "checkout manifest.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -963,7 +963,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout f.cache.write guard file",
+    "name": "checkout f.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1223,7 +1223,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout f.cache.remove guard file",
+    "name": "checkout f.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipes/repo_roller.expected/host-prefix.json b/recipes/repo_roller.expected/host-prefix.json
index ba71ea6..3b4b35c 100644
--- a/recipes/repo_roller.expected/host-prefix.json
+++ b/recipes/repo_roller.expected/host-prefix.json
@@ -145,7 +145,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout manifest.cache.write guard file",
+    "name": "checkout manifest.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -405,7 +405,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout manifest.cache.remove guard file",
+    "name": "checkout manifest.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -963,7 +963,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout h.cache.write guard file",
+    "name": "checkout h.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1223,7 +1223,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout h.cache.remove guard file",
+    "name": "checkout h.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipes/repo_roller.expected/name-not-found.json b/recipes/repo_roller.expected/name-not-found.json
index dcd3e47..4bba4ab 100644
--- a/recipes/repo_roller.expected/name-not-found.json
+++ b/recipes/repo_roller.expected/name-not-found.json
@@ -145,7 +145,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout manifest.cache.write guard file",
+    "name": "checkout manifest.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -405,7 +405,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout manifest.cache.remove guard file",
+    "name": "checkout manifest.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipes/repo_roller.expected/no-trigger-with-revision-branch.json b/recipes/repo_roller.expected/no-trigger-with-revision-branch.json
index 63ac4c9..14ea578 100644
--- a/recipes/repo_roller.expected/no-trigger-with-revision-branch.json
+++ b/recipes/repo_roller.expected/no-trigger-with-revision-branch.json
@@ -85,7 +85,7 @@
     ],
     "cwd": "[START_DIR]/checkout",
     "infra_step": true,
-    "name": "checkout manifest.cache.write guard file",
+    "name": "checkout manifest.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -237,7 +237,7 @@
     ],
     "cwd": "[START_DIR]/checkout",
     "infra_step": true,
-    "name": "checkout manifest.cache.remove guard file",
+    "name": "checkout manifest.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -579,7 +579,7 @@
     ],
     "cwd": "[START_DIR]/project",
     "infra_step": true,
-    "name": "checkout c.cache.write guard file",
+    "name": "checkout c.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -731,7 +731,7 @@
     ],
     "cwd": "[START_DIR]/project",
     "infra_step": true,
-    "name": "checkout c.cache.remove guard file",
+    "name": "checkout c.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipes/repo_roller.expected/no-trigger-with-revision-hash.json b/recipes/repo_roller.expected/no-trigger-with-revision-hash.json
index 07e83f8..6685ce6 100644
--- a/recipes/repo_roller.expected/no-trigger-with-revision-hash.json
+++ b/recipes/repo_roller.expected/no-trigger-with-revision-hash.json
@@ -85,7 +85,7 @@
     ],
     "cwd": "[START_DIR]/checkout",
     "infra_step": true,
-    "name": "checkout manifest.cache.write guard file",
+    "name": "checkout manifest.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -237,7 +237,7 @@
     ],
     "cwd": "[START_DIR]/checkout",
     "infra_step": true,
-    "name": "checkout manifest.cache.remove guard file",
+    "name": "checkout manifest.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -579,7 +579,7 @@
     ],
     "cwd": "[START_DIR]/project",
     "infra_step": true,
-    "name": "checkout d.cache.write guard file",
+    "name": "checkout d.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -731,7 +731,7 @@
     ],
     "cwd": "[START_DIR]/project",
     "infra_step": true,
-    "name": "checkout d.cache.remove guard file",
+    "name": "checkout d.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipes/repo_roller.expected/no-trigger-with-revision-tag.json b/recipes/repo_roller.expected/no-trigger-with-revision-tag.json
index 875d3e4..e2013b6 100644
--- a/recipes/repo_roller.expected/no-trigger-with-revision-tag.json
+++ b/recipes/repo_roller.expected/no-trigger-with-revision-tag.json
@@ -85,7 +85,7 @@
     ],
     "cwd": "[START_DIR]/checkout",
     "infra_step": true,
-    "name": "checkout manifest.cache.write guard file",
+    "name": "checkout manifest.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -237,7 +237,7 @@
     ],
     "cwd": "[START_DIR]/checkout",
     "infra_step": true,
-    "name": "checkout manifest.cache.remove guard file",
+    "name": "checkout manifest.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -579,7 +579,7 @@
     ],
     "cwd": "[START_DIR]/project",
     "infra_step": true,
-    "name": "checkout e5.cache.write guard file",
+    "name": "checkout e5.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -731,7 +731,7 @@
     ],
     "cwd": "[START_DIR]/project",
     "infra_step": true,
-    "name": "checkout e5.cache.remove guard file",
+    "name": "checkout e5.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipes/repo_roller.expected/no-trigger-with-upstream.json b/recipes/repo_roller.expected/no-trigger-with-upstream.json
index 52b12f5..744ba0a 100644
--- a/recipes/repo_roller.expected/no-trigger-with-upstream.json
+++ b/recipes/repo_roller.expected/no-trigger-with-upstream.json
@@ -85,7 +85,7 @@
     ],
     "cwd": "[START_DIR]/checkout",
     "infra_step": true,
-    "name": "checkout manifest.cache.write guard file",
+    "name": "checkout manifest.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -237,7 +237,7 @@
     ],
     "cwd": "[START_DIR]/checkout",
     "infra_step": true,
-    "name": "checkout manifest.cache.remove guard file",
+    "name": "checkout manifest.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -579,7 +579,7 @@
     ],
     "cwd": "[START_DIR]/project",
     "infra_step": true,
-    "name": "checkout a.cache.write guard file",
+    "name": "checkout a.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -731,7 +731,7 @@
     ],
     "cwd": "[START_DIR]/project",
     "infra_step": true,
-    "name": "checkout a.cache.remove guard file",
+    "name": "checkout a.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipes/repo_roller.expected/success.json b/recipes/repo_roller.expected/success.json
index d61b3b3..8f1798a 100644
--- a/recipes/repo_roller.expected/success.json
+++ b/recipes/repo_roller.expected/success.json
@@ -145,7 +145,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout manifest.cache.write guard file",
+    "name": "checkout manifest.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -405,7 +405,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout manifest.cache.remove guard file",
+    "name": "checkout manifest.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -963,7 +963,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout a.cache.write guard file",
+    "name": "checkout a.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1223,7 +1223,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout a.cache.remove guard file",
+    "name": "checkout a.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipes/repo_roller.expected/upstream-not-set-revision-not-branch.json b/recipes/repo_roller.expected/upstream-not-set-revision-not-branch.json
index 091e050..a97eba8 100644
--- a/recipes/repo_roller.expected/upstream-not-set-revision-not-branch.json
+++ b/recipes/repo_roller.expected/upstream-not-set-revision-not-branch.json
@@ -145,7 +145,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout manifest.cache.write guard file",
+    "name": "checkout manifest.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -405,7 +405,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout manifest.cache.remove guard file",
+    "name": "checkout manifest.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipes/repo_roller.expected/upstream-not-set.json b/recipes/repo_roller.expected/upstream-not-set.json
index 386493f..4c02df4 100644
--- a/recipes/repo_roller.expected/upstream-not-set.json
+++ b/recipes/repo_roller.expected/upstream-not-set.json
@@ -145,7 +145,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout manifest.cache.write guard file",
+    "name": "checkout manifest.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -405,7 +405,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout manifest.cache.remove guard file",
+    "name": "checkout manifest.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -963,7 +963,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout c.cache.write guard file",
+    "name": "checkout c.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1223,7 +1223,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout c.cache.remove guard file",
+    "name": "checkout c.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipes/run_script.expected/run_script.json b/recipes/run_script.expected/run_script.json
index a1b6638..1103913 100644
--- a/recipes/run_script.expected/run_script.json
+++ b/recipes/run_script.expected/run_script.json
@@ -240,7 +240,7 @@
     ],
     "cwd": "[START_DIR]/checkout",
     "infra_step": true,
-    "name": "checkout pigweed.cache.write guard file",
+    "name": "checkout pigweed.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -392,7 +392,7 @@
     ],
     "cwd": "[START_DIR]/checkout",
     "infra_step": true,
-    "name": "checkout pigweed.cache.remove guard file",
+    "name": "checkout pigweed.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipes/submodule_roller.expected/backwards.json b/recipes/submodule_roller.expected/backwards.json
index ba5fe62..15c5054 100644
--- a/recipes/submodule_roller.expected/backwards.json
+++ b/recipes/submodule_roller.expected/backwards.json
@@ -145,7 +145,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.write guard file",
+    "name": "checkout pigweed.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -405,7 +405,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.remove guard file",
+    "name": "checkout pigweed.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipes/submodule_roller.expected/failure-cc-authors.json b/recipes/submodule_roller.expected/failure-cc-authors.json
index b460ce4..7ea89a6 100644
--- a/recipes/submodule_roller.expected/failure-cc-authors.json
+++ b/recipes/submodule_roller.expected/failure-cc-authors.json
@@ -145,7 +145,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.write guard file",
+    "name": "checkout pigweed.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -405,7 +405,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.remove guard file",
+    "name": "checkout pigweed.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipes/submodule_roller.expected/name-not-found.json b/recipes/submodule_roller.expected/name-not-found.json
index e9e0214..5bade23 100644
--- a/recipes/submodule_roller.expected/name-not-found.json
+++ b/recipes/submodule_roller.expected/name-not-found.json
@@ -145,7 +145,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.write guard file",
+    "name": "checkout pigweed.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -405,7 +405,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.remove guard file",
+    "name": "checkout pigweed.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipes/submodule_roller.expected/no-revision.json b/recipes/submodule_roller.expected/no-revision.json
index 4bfb5ab..e140f3d 100644
--- a/recipes/submodule_roller.expected/no-revision.json
+++ b/recipes/submodule_roller.expected/no-revision.json
@@ -85,7 +85,7 @@
     ],
     "cwd": "[START_DIR]/checkout",
     "infra_step": true,
-    "name": "checkout pigweed.cache.write guard file",
+    "name": "checkout pigweed.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -237,7 +237,7 @@
     ],
     "cwd": "[START_DIR]/checkout",
     "infra_step": true,
-    "name": "checkout pigweed.cache.remove guard file",
+    "name": "checkout pigweed.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipes/submodule_roller.expected/relative-dot.json b/recipes/submodule_roller.expected/relative-dot.json
index 49b91b5..2194e67 100644
--- a/recipes/submodule_roller.expected/relative-dot.json
+++ b/recipes/submodule_roller.expected/relative-dot.json
@@ -145,7 +145,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.write guard file",
+    "name": "checkout pigweed.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -405,7 +405,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.remove guard file",
+    "name": "checkout pigweed.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipes/submodule_roller.expected/relative-dotdot-dotdot-always-cc-reviewers.json b/recipes/submodule_roller.expected/relative-dotdot-dotdot-always-cc-reviewers.json
index 1dbe2dd..60c1d09 100644
--- a/recipes/submodule_roller.expected/relative-dotdot-dotdot-always-cc-reviewers.json
+++ b/recipes/submodule_roller.expected/relative-dotdot-dotdot-always-cc-reviewers.json
@@ -145,7 +145,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.write guard file",
+    "name": "checkout pigweed.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -405,7 +405,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.remove guard file",
+    "name": "checkout pigweed.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipes/submodule_roller.expected/relative-dotdot.json b/recipes/submodule_roller.expected/relative-dotdot.json
index 311740f..8d3ca6c 100644
--- a/recipes/submodule_roller.expected/relative-dotdot.json
+++ b/recipes/submodule_roller.expected/relative-dotdot.json
@@ -145,7 +145,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.write guard file",
+    "name": "checkout pigweed.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -405,7 +405,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.remove guard file",
+    "name": "checkout pigweed.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipes/submodule_roller.expected/success-sso-cc-authors.json b/recipes/submodule_roller.expected/success-sso-cc-authors.json
index 1f9b4c7..6871386 100644
--- a/recipes/submodule_roller.expected/success-sso-cc-authors.json
+++ b/recipes/submodule_roller.expected/success-sso-cc-authors.json
@@ -145,7 +145,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.write guard file",
+    "name": "checkout pigweed.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -405,7 +405,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.remove guard file",
+    "name": "checkout pigweed.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipes/submodule_roller.expected/too-many-skip-deps.json b/recipes/submodule_roller.expected/too-many-skip-deps.json
index d3c78bb..45a6f8a 100644
--- a/recipes/submodule_roller.expected/too-many-skip-deps.json
+++ b/recipes/submodule_roller.expected/too-many-skip-deps.json
@@ -145,7 +145,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.write guard file",
+    "name": "checkout pigweed.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -405,7 +405,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.remove guard file",
+    "name": "checkout pigweed.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipes/submodule_roller.expected/trigger-mismatch-equivalent.json b/recipes/submodule_roller.expected/trigger-mismatch-equivalent.json
index 6e49ae6..bf7567e 100644
--- a/recipes/submodule_roller.expected/trigger-mismatch-equivalent.json
+++ b/recipes/submodule_roller.expected/trigger-mismatch-equivalent.json
@@ -145,7 +145,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.write guard file",
+    "name": "checkout pigweed.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -405,7 +405,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.remove guard file",
+    "name": "checkout pigweed.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipes/submodule_roller.expected/trigger-mismatch.json b/recipes/submodule_roller.expected/trigger-mismatch.json
index 0c1ede3..a599abe 100644
--- a/recipes/submodule_roller.expected/trigger-mismatch.json
+++ b/recipes/submodule_roller.expected/trigger-mismatch.json
@@ -145,7 +145,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.write guard file",
+    "name": "checkout pigweed.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -405,7 +405,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.remove guard file",
+    "name": "checkout pigweed.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipes/submodule_roller.expected/with-branch-prop-filter-emails.json b/recipes/submodule_roller.expected/with-branch-prop-filter-emails.json
index d933403..a863878 100644
--- a/recipes/submodule_roller.expected/with-branch-prop-filter-emails.json
+++ b/recipes/submodule_roller.expected/with-branch-prop-filter-emails.json
@@ -85,7 +85,7 @@
     ],
     "cwd": "[START_DIR]/checkout",
     "infra_step": true,
-    "name": "checkout pigweed.cache.write guard file",
+    "name": "checkout pigweed.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -237,7 +237,7 @@
     ],
     "cwd": "[START_DIR]/checkout",
     "infra_step": true,
-    "name": "checkout pigweed.cache.remove guard file",
+    "name": "checkout pigweed.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipes/submodule_roller.expected/with-requires-already-applied.json b/recipes/submodule_roller.expected/with-requires-already-applied.json
index 44f0dee..81fe244 100644
--- a/recipes/submodule_roller.expected/with-requires-already-applied.json
+++ b/recipes/submodule_roller.expected/with-requires-already-applied.json
@@ -145,7 +145,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.write guard file",
+    "name": "checkout pigweed.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -405,7 +405,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.remove guard file",
+    "name": "checkout pigweed.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipes/submodule_roller.expected/with-requires-child.json b/recipes/submodule_roller.expected/with-requires-child.json
index 3f22ded..5679a50 100644
--- a/recipes/submodule_roller.expected/with-requires-child.json
+++ b/recipes/submodule_roller.expected/with-requires-child.json
@@ -145,7 +145,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.write guard file",
+    "name": "checkout pigweed.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -405,7 +405,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.remove guard file",
+    "name": "checkout pigweed.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipes/submodule_roller.expected/with-requires-forbidden.json b/recipes/submodule_roller.expected/with-requires-forbidden.json
index 6ea403f..3f7240a 100644
--- a/recipes/submodule_roller.expected/with-requires-forbidden.json
+++ b/recipes/submodule_roller.expected/with-requires-forbidden.json
@@ -145,7 +145,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.write guard file",
+    "name": "checkout pigweed.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -405,7 +405,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.remove guard file",
+    "name": "checkout pigweed.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipes/submodule_roller.expected/with-requires-loop.json b/recipes/submodule_roller.expected/with-requires-loop.json
index 69e74a8..cdfb8b2 100644
--- a/recipes/submodule_roller.expected/with-requires-loop.json
+++ b/recipes/submodule_roller.expected/with-requires-loop.json
@@ -145,7 +145,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.write guard file",
+    "name": "checkout pigweed.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -405,7 +405,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.remove guard file",
+    "name": "checkout pigweed.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipes/submodule_roller.expected/with-requires-not-in-checkout.json b/recipes/submodule_roller.expected/with-requires-not-in-checkout.json
index e13a086..715022c 100644
--- a/recipes/submodule_roller.expected/with-requires-not-in-checkout.json
+++ b/recipes/submodule_roller.expected/with-requires-not-in-checkout.json
@@ -145,7 +145,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.write guard file",
+    "name": "checkout pigweed.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -405,7 +405,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.remove guard file",
+    "name": "checkout pigweed.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipes/submodule_roller.expected/with-requires-parent.json b/recipes/submodule_roller.expected/with-requires-parent.json
index afed27a..97926f1 100644
--- a/recipes/submodule_roller.expected/with-requires-parent.json
+++ b/recipes/submodule_roller.expected/with-requires-parent.json
@@ -145,7 +145,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.write guard file",
+    "name": "checkout pigweed.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -405,7 +405,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.remove guard file",
+    "name": "checkout pigweed.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipes/submodule_roller.expected/with-requires-transitive.json b/recipes/submodule_roller.expected/with-requires-transitive.json
index 0d0282f..a9f15e5 100644
--- a/recipes/submodule_roller.expected/with-requires-transitive.json
+++ b/recipes/submodule_roller.expected/with-requires-transitive.json
@@ -145,7 +145,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.write guard file",
+    "name": "checkout pigweed.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -405,7 +405,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.remove guard file",
+    "name": "checkout pigweed.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipes/submodule_roller.expected/with-requires.json b/recipes/submodule_roller.expected/with-requires.json
index 0fd13b6..1b778ec 100644
--- a/recipes/submodule_roller.expected/with-requires.json
+++ b/recipes/submodule_roller.expected/with-requires.json
@@ -145,7 +145,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.write guard file",
+    "name": "checkout pigweed.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -405,7 +405,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.remove guard file",
+    "name": "checkout pigweed.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipes/target_to_cipd.expected/pw-presubmit.json b/recipes/target_to_cipd.expected/pw-presubmit.json
index b5d8cb0..a4c1283 100644
--- a/recipes/target_to_cipd.expected/pw-presubmit.json
+++ b/recipes/target_to_cipd.expected/pw-presubmit.json
@@ -240,7 +240,7 @@
     ],
     "cwd": "[START_DIR]/checkout",
     "infra_step": true,
-    "name": "checkout pigweed.cache.write guard file",
+    "name": "checkout pigweed.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -392,7 +392,7 @@
     ],
     "cwd": "[START_DIR]/checkout",
     "infra_step": true,
-    "name": "checkout pigweed.cache.remove guard file",
+    "name": "checkout pigweed.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipes/target_to_git.expected/success.json b/recipes/target_to_git.expected/success.json
index b00abb1..888b65a 100644
--- a/recipes/target_to_git.expected/success.json
+++ b/recipes/target_to_git.expected/success.json
@@ -339,7 +339,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.write guard file",
+    "name": "checkout pigweed.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -599,7 +599,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.remove guard file",
+    "name": "checkout pigweed.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1329,7 +1329,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout generated.cache.write guard file",
+    "name": "checkout generated.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1589,7 +1589,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout generated.cache.remove guard file",
+    "name": "checkout generated.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipes/tokendb_check.expected/addition.json b/recipes/tokendb_check.expected/addition.json
index 8f6e01b..226a698 100644
--- a/recipes/tokendb_check.expected/addition.json
+++ b/recipes/tokendb_check.expected/addition.json
@@ -673,7 +673,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout.cache.write guard file",
+    "name": "checkout.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -933,7 +933,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout.cache.remove guard file",
+    "name": "checkout.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipes/tokendb_check.expected/no-change.json b/recipes/tokendb_check.expected/no-change.json
index 8f6e01b..226a698 100644
--- a/recipes/tokendb_check.expected/no-change.json
+++ b/recipes/tokendb_check.expected/no-change.json
@@ -673,7 +673,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout.cache.write guard file",
+    "name": "checkout.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -933,7 +933,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout.cache.remove guard file",
+    "name": "checkout.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipes/tokendb_check.expected/removal.json b/recipes/tokendb_check.expected/removal.json
index bfca4df..0b1ba58 100644
--- a/recipes/tokendb_check.expected/removal.json
+++ b/recipes/tokendb_check.expected/removal.json
@@ -673,7 +673,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout.cache.write guard file",
+    "name": "checkout.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -933,7 +933,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout.cache.remove guard file",
+    "name": "checkout.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipes/tokendb_updater.expected/dry-run.json b/recipes/tokendb_updater.expected/dry-run.json
index 9f5600c..79fa86d 100644
--- a/recipes/tokendb_updater.expected/dry-run.json
+++ b/recipes/tokendb_updater.expected/dry-run.json
@@ -240,7 +240,7 @@
     ],
     "cwd": "[START_DIR]/checkout",
     "infra_step": true,
-    "name": "checkout pigweed.cache.write guard file",
+    "name": "checkout pigweed.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -392,7 +392,7 @@
     ],
     "cwd": "[START_DIR]/checkout",
     "infra_step": true,
-    "name": "checkout pigweed.cache.remove guard file",
+    "name": "checkout pigweed.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipes/tokendb_updater.expected/separate-repo.json b/recipes/tokendb_updater.expected/separate-repo.json
index f3f7d48..588f72e 100644
--- a/recipes/tokendb_updater.expected/separate-repo.json
+++ b/recipes/tokendb_updater.expected/separate-repo.json
@@ -240,7 +240,7 @@
     ],
     "cwd": "[START_DIR]/checkout",
     "infra_step": true,
-    "name": "checkout pigweed.cache.write guard file",
+    "name": "checkout pigweed.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -392,7 +392,7 @@
     ],
     "cwd": "[START_DIR]/checkout",
     "infra_step": true,
-    "name": "checkout pigweed.cache.remove guard file",
+    "name": "checkout pigweed.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -835,7 +835,7 @@
     ],
     "cwd": "[START_DIR]/tokendb",
     "infra_step": true,
-    "name": "checkout tokendb.cache.write guard file",
+    "name": "checkout tokendb.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -987,7 +987,7 @@
     ],
     "cwd": "[START_DIR]/tokendb",
     "infra_step": true,
-    "name": "checkout tokendb.cache.remove guard file",
+    "name": "checkout tokendb.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipes/tokendb_updater.expected/simple.json b/recipes/tokendb_updater.expected/simple.json
index 86ebf6a..dce16ca 100644
--- a/recipes/tokendb_updater.expected/simple.json
+++ b/recipes/tokendb_updater.expected/simple.json
@@ -240,7 +240,7 @@
     ],
     "cwd": "[START_DIR]/checkout",
     "infra_step": true,
-    "name": "checkout pigweed.cache.write guard file",
+    "name": "checkout pigweed.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -392,7 +392,7 @@
     ],
     "cwd": "[START_DIR]/checkout",
     "infra_step": true,
-    "name": "checkout pigweed.cache.remove guard file",
+    "name": "checkout pigweed.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipes/txt_roller.expected/backwards.json b/recipes/txt_roller.expected/backwards.json
index 164b1b7..72dd176 100644
--- a/recipes/txt_roller.expected/backwards.json
+++ b/recipes/txt_roller.expected/backwards.json
@@ -85,7 +85,7 @@
     ],
     "cwd": "[START_DIR]/checkout",
     "infra_step": true,
-    "name": "checkout pigweed.cache.write guard file",
+    "name": "checkout pigweed.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -237,7 +237,7 @@
     ],
     "cwd": "[START_DIR]/checkout",
     "infra_step": true,
-    "name": "checkout pigweed.cache.remove guard file",
+    "name": "checkout pigweed.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -690,7 +690,7 @@
     ],
     "cwd": "[START_DIR]/project",
     "infra_step": true,
-    "name": "checkout foo.cache.write guard file",
+    "name": "checkout foo.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -842,7 +842,7 @@
     ],
     "cwd": "[START_DIR]/project",
     "infra_step": true,
-    "name": "checkout foo.cache.remove guard file",
+    "name": "checkout foo.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipes/txt_roller.expected/bad-trigger.json b/recipes/txt_roller.expected/bad-trigger.json
index 6ad45ae..7a2dbb6 100644
--- a/recipes/txt_roller.expected/bad-trigger.json
+++ b/recipes/txt_roller.expected/bad-trigger.json
@@ -145,7 +145,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.write guard file",
+    "name": "checkout pigweed.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -405,7 +405,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.remove guard file",
+    "name": "checkout pigweed.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipes/txt_roller.expected/no-trigger.json b/recipes/txt_roller.expected/no-trigger.json
index a3d43e3..f5d7178 100644
--- a/recipes/txt_roller.expected/no-trigger.json
+++ b/recipes/txt_roller.expected/no-trigger.json
@@ -85,7 +85,7 @@
     ],
     "cwd": "[START_DIR]/checkout",
     "infra_step": true,
-    "name": "checkout pigweed.cache.write guard file",
+    "name": "checkout pigweed.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -237,7 +237,7 @@
     ],
     "cwd": "[START_DIR]/checkout",
     "infra_step": true,
-    "name": "checkout pigweed.cache.remove guard file",
+    "name": "checkout pigweed.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -690,7 +690,7 @@
     ],
     "cwd": "[START_DIR]/project",
     "infra_step": true,
-    "name": "checkout foo.cache.write guard file",
+    "name": "checkout foo.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -842,7 +842,7 @@
     ],
     "cwd": "[START_DIR]/project",
     "infra_step": true,
-    "name": "checkout foo.cache.remove guard file",
+    "name": "checkout foo.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipes/txt_roller.expected/success.json b/recipes/txt_roller.expected/success.json
index 6e5a929..67ea486 100644
--- a/recipes/txt_roller.expected/success.json
+++ b/recipes/txt_roller.expected/success.json
@@ -145,7 +145,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.write guard file",
+    "name": "checkout pigweed.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -405,7 +405,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.remove guard file",
+    "name": "checkout pigweed.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1101,7 +1101,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout foo.cache.write guard file",
+    "name": "checkout foo.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1361,7 +1361,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout foo.cache.remove guard file",
+    "name": "checkout foo.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipes/update_python_versions.expected/simple.json b/recipes/update_python_versions.expected/simple.json
index 0dbc6b6..5593e55 100644
--- a/recipes/update_python_versions.expected/simple.json
+++ b/recipes/update_python_versions.expected/simple.json
@@ -240,7 +240,7 @@
     ],
     "cwd": "[START_DIR]/checkout",
     "infra_step": true,
-    "name": "checkout pigweed.cache.write guard file",
+    "name": "checkout pigweed.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -392,7 +392,7 @@
     ],
     "cwd": "[START_DIR]/checkout",
     "infra_step": true,
-    "name": "checkout pigweed.cache.remove guard file",
+    "name": "checkout pigweed.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipes/xrefs.expected/dry_run.json b/recipes/xrefs.expected/dry_run.json
index b486cb3..3d752ce 100644
--- a/recipes/xrefs.expected/dry_run.json
+++ b/recipes/xrefs.expected/dry_run.json
@@ -240,7 +240,7 @@
     ],
     "cwd": "[START_DIR]/checkout",
     "infra_step": true,
-    "name": "checkout pigweed.cache.write guard file",
+    "name": "checkout pigweed.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -392,7 +392,7 @@
     ],
     "cwd": "[START_DIR]/checkout",
     "infra_step": true,
-    "name": "checkout pigweed.cache.remove guard file",
+    "name": "checkout pigweed.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipes/xrefs.expected/kythe.json b/recipes/xrefs.expected/kythe.json
index 2d2c13b..5f75e44 100644
--- a/recipes/xrefs.expected/kythe.json
+++ b/recipes/xrefs.expected/kythe.json
@@ -240,7 +240,7 @@
     ],
     "cwd": "[START_DIR]/checkout",
     "infra_step": true,
-    "name": "checkout pigweed.cache.write guard file",
+    "name": "checkout pigweed.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -392,7 +392,7 @@
     ],
     "cwd": "[START_DIR]/checkout",
     "infra_step": true,
-    "name": "checkout pigweed.cache.remove guard file",
+    "name": "checkout pigweed.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/recipes/xrefs.expected/tryjob.json b/recipes/xrefs.expected/tryjob.json
index b65a27b..830d3af 100644
--- a/recipes/xrefs.expected/tryjob.json
+++ b/recipes/xrefs.expected/tryjob.json
@@ -550,7 +550,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.write guard file",
+    "name": "checkout pigweed.cache.write git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -810,7 +810,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout pigweed.cache.remove guard file",
+    "name": "checkout pigweed.cache.remove git cache guard file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]