backport of git uptodate change from deathbeds#16

bollwyvl · Dec 3, 2023 · c7dffe7 · c7dffe7
1 parent 0a68b58
commit c7dffe7
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/examples/a11y-prs/jupyak_config.yaml b/examples/a11y-prs/jupyak_config.yaml
@@ -0,0 +1,17 @@
+lite:
+  gist: 7232671f04a5de8f1ce4b810f5ea8a3a
+
+repos:
+  lumino: {github: {merge_with: [pull/655]}}
+
+  jupyterlab:
+    github:
+      merge_strategy: ort
+      merge_options: [theirs]
+      merge_with:
+        - pull/14575
+        - pull/14597
+        - pull/14766
+        - pull/14854
+        - pull/15222
+        - pull/15347
diff --git a/src/jupyak/tasks/_git.ipynb b/src/jupyak/tasks/_git.ipynb
@@ -208,6 +208,11 @@
     "\n",
     "    yield dict(\n",
     "        name=f\"{name}:checkout\",\n",
+    "        uptodate=[\n",
+    "            doit.tools.config_changed(\n",
+    "                {\"s\": merge_strategy, \"x\": merge_options, \"refs\": local_refs}\n",
+    "            )\n",
+    "        ],\n",
     "        actions=actions,\n",
     "        file_dep=file_dep,\n",
     "        targets=targets,\n",