From eefa1302170ca4f5e87cb63807fd8fb8dc488299 Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Thu, 1 Aug 2024 12:55:04 +0200
Subject: [PATCH] bump git2 dependency to 0.19

This means we no longer drop trailing "." in author names, so the cache version has to change.
---
 Cargo.lock                                          | 8 ++++----
 Cargo.toml                                          | 2 +-
 josh-core/src/cache.rs                              | 2 +-
 tests/proxy/amend_patchset.t                        | 2 +-
 tests/proxy/authentication.t                        | 2 +-
 tests/proxy/caching.t                               | 4 ++--
 tests/proxy/clone_absent_head.t                     | 2 +-
 tests/proxy/clone_all.t                             | 2 +-
 tests/proxy/clone_blocked.t                         | 2 +-
 tests/proxy/clone_invalid_url.t                     | 2 +-
 tests/proxy/clone_locked_refs.t                     | 2 +-
 tests/proxy/clone_prefix.t                          | 2 +-
 tests/proxy/clone_sha.t                             | 2 +-
 tests/proxy/clone_subsubtree.t                      | 2 +-
 tests/proxy/clone_subtree.t                         | 2 +-
 tests/proxy/clone_subtree_no_master.t               | 2 +-
 tests/proxy/clone_subtree_tags.t                    | 2 +-
 tests/proxy/clone_with_meta.t                       | 2 +-
 tests/proxy/empty_commit.t                          | 2 +-
 tests/proxy/get_version.t                           | 2 +-
 tests/proxy/import_export.t                         | 2 +-
 tests/proxy/join_with_merge.t                       | 2 +-
 tests/proxy/markers.t                               | 2 +-
 tests/proxy/no_proxy.t                              | 2 +-
 tests/proxy/no_proxy_lfs.t                          | 2 +-
 tests/proxy/push_graphql.t                          | 2 +-
 tests/proxy/push_new_branch.t                       | 2 +-
 tests/proxy/push_prefix.t                           | 2 +-
 tests/proxy/push_review.t                           | 2 +-
 tests/proxy/push_review_already_in.t                | 2 +-
 tests/proxy/push_review_nop_behind.t                | 2 +-
 tests/proxy/push_review_old.t                       | 2 +-
 tests/proxy/push_review_topic.t                     | 2 +-
 tests/proxy/push_stacked.t                          | 2 +-
 tests/proxy/push_stacked_gerrit.t                   | 2 +-
 tests/proxy/push_stacked_split.t                    | 2 +-
 tests/proxy/push_stacked_sub.t                      | 2 +-
 tests/proxy/push_subdir_prefix.t                    | 2 +-
 tests/proxy/push_subtree.t                          | 2 +-
 tests/proxy/push_subtree_two_repos.t                | 2 +-
 tests/proxy/unrelated_leak.t                        | 2 +-
 tests/proxy/workspace.t                             | 2 +-
 tests/proxy/workspace_create.t                      | 2 +-
 tests/proxy/workspace_discover.t                    | 2 +-
 tests/proxy/workspace_edit_commit.t                 | 2 +-
 tests/proxy/workspace_in_workspace.t                | 2 +-
 tests/proxy/workspace_invalid_trailing_slash.t      | 2 +-
 tests/proxy/workspace_modify.t                      | 2 +-
 tests/proxy/workspace_modify_chain.t                | 2 +-
 tests/proxy/workspace_modify_chain_prefix_subtree.t | 2 +-
 tests/proxy/workspace_pre_history.t                 | 2 +-
 tests/proxy/workspace_publish.t                     | 2 +-
 tests/proxy/workspace_tags.t                        | 2 +-
 53 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9ec279e3..fac24821 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -763,9 +763,9 @@ dependencies = [
 
 [[package]]
 name = "git2"
-version = "0.18.3"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "232e6a7bfe35766bf715e55a88b39a700596c0ccfd88cd3680b4cdb40d66ef70"
+checksum = "b903b73e45dc0c6c596f2d37eccece7c1c8bb6e4407b001096387c63d0d93724"
 dependencies = [
  "bitflags 2.4.2",
  "libc",
@@ -1777,9 +1777,9 @@ checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
 
 [[package]]
 name = "libgit2-sys"
-version = "0.16.2+1.7.2"
+version = "0.17.0+1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee4126d8b4ee5c9d9ea891dd875cfdc1e9d0950437179104b183d7d8a74d24e8"
+checksum = "10472326a8a6477c3c20a64547b0059e4b0d086869eee31e6d7da728a8eb7224"
 dependencies = [
  "cc",
  "libc",
diff --git a/Cargo.toml b/Cargo.toml
index 49a93b33..90cde8f5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -37,7 +37,7 @@ tempfile = "3.10.1"
 
 [workspace.dependencies.git2]
 default-features = false
-version = "0.18.3"
+version = "0.19"
 
 [workspace.dependencies.juniper]
 version = "0.15.11"
diff --git a/josh-core/src/cache.rs b/josh-core/src/cache.rs
index 5081758d..5b455672 100644
--- a/josh-core/src/cache.rs
+++ b/josh-core/src/cache.rs
@@ -1,7 +1,7 @@
 use super::*;
 use std::collections::HashMap;
 
-const CACHE_VERSION: u64 = 19;
+const CACHE_VERSION: u64 = 20;
 
 lazy_static! {
     static ref DB: std::sync::Mutex<Option<sled::Db>> = std::sync::Mutex::new(None);
diff --git a/tests/proxy/amend_patchset.t b/tests/proxy/amend_patchset.t
index e60bd682..89ee6e2a 100644
--- a/tests/proxy/amend_patchset.t
+++ b/tests/proxy/amend_patchset.t
@@ -124,7 +124,7 @@
   ]
   .
   |-- josh
-  |   `-- 19
+  |   `-- 20
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/authentication.t b/tests/proxy/authentication.t
index 0d887992..e0a8282c 100644
--- a/tests/proxy/authentication.t
+++ b/tests/proxy/authentication.t
@@ -124,7 +124,7 @@
   "real_repo.git" = ["::sub1/"]
   .
   |-- josh
-  |   `-- 19
+  |   `-- 20
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/caching.t b/tests/proxy/caching.t
index 6fe2e6f7..9b726eaa 100644
--- a/tests/proxy/caching.t
+++ b/tests/proxy/caching.t
@@ -51,7 +51,7 @@
   ]
   .
   |-- josh
-  |   `-- 19
+  |   `-- 20
   |       `-- sled
   |           |-- blobs
   |           |-- conf
@@ -162,7 +162,7 @@
   ]
   .
   |-- josh
-  |   `-- 19
+  |   `-- 20
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/clone_absent_head.t b/tests/proxy/clone_absent_head.t
index 762b8cf3..6a70318f 100644
--- a/tests/proxy/clone_absent_head.t
+++ b/tests/proxy/clone_absent_head.t
@@ -85,7 +85,7 @@
   $ bash ${TESTDIR}/destroy_test_env.sh
   .
   |-- josh
-  |   `-- 19
+  |   `-- 20
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/clone_all.t b/tests/proxy/clone_all.t
index dfe84ea9..2bdd77aa 100644
--- a/tests/proxy/clone_all.t
+++ b/tests/proxy/clone_all.t
@@ -53,7 +53,7 @@
   "real_repo.git" = ["::sub1/"]
   .
   |-- josh
-  |   `-- 19
+  |   `-- 20
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/clone_blocked.t b/tests/proxy/clone_blocked.t
index c3556d00..5956ff7f 100644
--- a/tests/proxy/clone_blocked.t
+++ b/tests/proxy/clone_blocked.t
@@ -9,7 +9,7 @@
   $ bash ${TESTDIR}/destroy_test_env.sh
   .
   |-- josh
-  |   `-- 19
+  |   `-- 20
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/clone_invalid_url.t b/tests/proxy/clone_invalid_url.t
index 5638ff50..7494d9d6 100644
--- a/tests/proxy/clone_invalid_url.t
+++ b/tests/proxy/clone_invalid_url.t
@@ -32,7 +32,7 @@
   $ bash ${TESTDIR}/destroy_test_env.sh
   .
   |-- josh
-  |   `-- 19
+  |   `-- 20
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/clone_locked_refs.t b/tests/proxy/clone_locked_refs.t
index 6103ae64..4b4aa12b 100644
--- a/tests/proxy/clone_locked_refs.t
+++ b/tests/proxy/clone_locked_refs.t
@@ -111,7 +111,7 @@
   ]
   .
   |-- josh
-  |   `-- 19
+  |   `-- 20
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/clone_prefix.t b/tests/proxy/clone_prefix.t
index a928e56c..8210afb5 100644
--- a/tests/proxy/clone_prefix.t
+++ b/tests/proxy/clone_prefix.t
@@ -74,7 +74,7 @@
   ]
   .
   |-- josh
-  |   `-- 19
+  |   `-- 20
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/clone_sha.t b/tests/proxy/clone_sha.t
index 3060741b..95cff430 100644
--- a/tests/proxy/clone_sha.t
+++ b/tests/proxy/clone_sha.t
@@ -93,7 +93,7 @@ Check (2) and (3) but with a branch ref
   "real_repo.git" = ["::sub1/"]
   .
   |-- josh
-  |   `-- 19
+  |   `-- 20
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/clone_subsubtree.t b/tests/proxy/clone_subsubtree.t
index eea2ae17..215494c5 100644
--- a/tests/proxy/clone_subsubtree.t
+++ b/tests/proxy/clone_subsubtree.t
@@ -87,7 +87,7 @@
   ]
   .
   |-- josh
-  |   `-- 19
+  |   `-- 20
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/clone_subtree.t b/tests/proxy/clone_subtree.t
index 8f5bba9a..237a9e41 100644
--- a/tests/proxy/clone_subtree.t
+++ b/tests/proxy/clone_subtree.t
@@ -85,7 +85,7 @@
   ]
   .
   |-- josh
-  |   `-- 19
+  |   `-- 20
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/clone_subtree_no_master.t b/tests/proxy/clone_subtree_no_master.t
index e1195d49..1658539c 100644
--- a/tests/proxy/clone_subtree_no_master.t
+++ b/tests/proxy/clone_subtree_no_master.t
@@ -78,7 +78,7 @@
   "real_repo.git" = [":/sub1"]
   .
   |-- josh
-  |   `-- 19
+  |   `-- 20
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/clone_subtree_tags.t b/tests/proxy/clone_subtree_tags.t
index 1fbe4bc7..3e784004 100644
--- a/tests/proxy/clone_subtree_tags.t
+++ b/tests/proxy/clone_subtree_tags.t
@@ -115,7 +115,7 @@
   ]
   .
   |-- josh
-  |   `-- 19
+  |   `-- 20
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/clone_with_meta.t b/tests/proxy/clone_with_meta.t
index c35b2bb7..d6006d08 100644
--- a/tests/proxy/clone_with_meta.t
+++ b/tests/proxy/clone_with_meta.t
@@ -129,7 +129,7 @@
   ]
   .
   |-- josh
-  |   `-- 19
+  |   `-- 20
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/empty_commit.t b/tests/proxy/empty_commit.t
index 126423fd..dab491c3 100644
--- a/tests/proxy/empty_commit.t
+++ b/tests/proxy/empty_commit.t
@@ -83,7 +83,7 @@ should still be included.
   "real_repo.git" = ["::sub1/"]
   .
   |-- josh
-  |   `-- 19
+  |   `-- 20
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/get_version.t b/tests/proxy/get_version.t
index 4680a00a..18a61d26 100644
--- a/tests/proxy/get_version.t
+++ b/tests/proxy/get_version.t
@@ -7,7 +7,7 @@
   $ bash ${TESTDIR}/destroy_test_env.sh
   .
   |-- josh
-  |   `-- 19
+  |   `-- 20
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/import_export.t b/tests/proxy/import_export.t
index 0543b3ac..1917dea7 100644
--- a/tests/proxy/import_export.t
+++ b/tests/proxy/import_export.t
@@ -301,7 +301,7 @@ Flushed credential cache
   "repo2.git" = [":prefix=repo2"]
   .
   |-- josh
-  |   `-- 19
+  |   `-- 20
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/join_with_merge.t b/tests/proxy/join_with_merge.t
index 88a98c37..ff292b4c 100644
--- a/tests/proxy/join_with_merge.t
+++ b/tests/proxy/join_with_merge.t
@@ -59,7 +59,7 @@
   "real_repo.git" = [":prefix=sub1"]
   .
   |-- josh
-  |   `-- 19
+  |   `-- 20
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/markers.t b/tests/proxy/markers.t
index 5e2b4c73..febea0dd 100644
--- a/tests/proxy/markers.t
+++ b/tests/proxy/markers.t
@@ -340,7 +340,7 @@
   ]
   .
   |-- josh
-  |   `-- 19
+  |   `-- 20
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/no_proxy.t b/tests/proxy/no_proxy.t
index 59efe06f..9b741dbf 100644
--- a/tests/proxy/no_proxy.t
+++ b/tests/proxy/no_proxy.t
@@ -35,7 +35,7 @@
   $ bash ${TESTDIR}/destroy_test_env.sh
   .
   |-- josh
-  |   `-- 19
+  |   `-- 20
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/no_proxy_lfs.t b/tests/proxy/no_proxy_lfs.t
index 3ce7e01d..0a23a861 100644
--- a/tests/proxy/no_proxy_lfs.t
+++ b/tests/proxy/no_proxy_lfs.t
@@ -50,7 +50,7 @@
   $ bash ${TESTDIR}/destroy_test_env.sh
   .
   |-- josh
-  |   `-- 19
+  |   `-- 20
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/push_graphql.t b/tests/proxy/push_graphql.t
index 9e11441c..e9a3e09e 100644
--- a/tests/proxy/push_graphql.t
+++ b/tests/proxy/push_graphql.t
@@ -69,7 +69,7 @@
   "real_repo.git" = ["::sub1/"]
   .
   |-- josh
-  |   `-- 19
+  |   `-- 20
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/push_new_branch.t b/tests/proxy/push_new_branch.t
index 03f3205e..c7910981 100644
--- a/tests/proxy/push_new_branch.t
+++ b/tests/proxy/push_new_branch.t
@@ -114,7 +114,7 @@ Check the branch again
   ]
   .
   |-- josh
-  |   `-- 19
+  |   `-- 20
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/push_prefix.t b/tests/proxy/push_prefix.t
index f6498c5b..76243a05 100644
--- a/tests/proxy/push_prefix.t
+++ b/tests/proxy/push_prefix.t
@@ -56,7 +56,7 @@
   ]
   .
   |-- josh
-  |   `-- 19
+  |   `-- 20
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/push_review.t b/tests/proxy/push_review.t
index 89e5795b..7ad98b78 100644
--- a/tests/proxy/push_review.t
+++ b/tests/proxy/push_review.t
@@ -87,7 +87,7 @@ Make sure all temporary namespace got removed
   ]
   .
   |-- josh
-  |   `-- 19
+  |   `-- 20
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/push_review_already_in.t b/tests/proxy/push_review_already_in.t
index d6dd0f8b..13ddca0e 100644
--- a/tests/proxy/push_review_already_in.t
+++ b/tests/proxy/push_review_already_in.t
@@ -48,7 +48,7 @@ test for that.
   "real_repo.git" = []
   .
   |-- josh
-  |   `-- 19
+  |   `-- 20
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/push_review_nop_behind.t b/tests/proxy/push_review_nop_behind.t
index ec7e73c3..3428f237 100644
--- a/tests/proxy/push_review_nop_behind.t
+++ b/tests/proxy/push_review_nop_behind.t
@@ -55,7 +55,7 @@ This is a regression test for that problem.
   "real_repo.git" = []
   .
   |-- josh
-  |   `-- 19
+  |   `-- 20
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/push_review_old.t b/tests/proxy/push_review_old.t
index 2532f8af..3f4bf16a 100644
--- a/tests/proxy/push_review_old.t
+++ b/tests/proxy/push_review_old.t
@@ -85,7 +85,7 @@ Flushed credential cache
   ]
   .
   |-- josh
-  |   `-- 19
+  |   `-- 20
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/push_review_topic.t b/tests/proxy/push_review_topic.t
index 719856a8..81c89636 100644
--- a/tests/proxy/push_review_topic.t
+++ b/tests/proxy/push_review_topic.t
@@ -42,7 +42,7 @@ Make sure all temporary namespace got removed
   ]
   .
   |-- josh
-  |   `-- 19
+  |   `-- 20
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/push_stacked.t b/tests/proxy/push_stacked.t
index 1ee3c9d8..95e194c8 100644
--- a/tests/proxy/push_stacked.t
+++ b/tests/proxy/push_stacked.t
@@ -151,7 +151,7 @@ Make sure all temporary namespace got removed
   ]
   .
   |-- josh
-  |   `-- 19
+  |   `-- 20
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/push_stacked_gerrit.t b/tests/proxy/push_stacked_gerrit.t
index ace09e14..82cfaa04 100644
--- a/tests/proxy/push_stacked_gerrit.t
+++ b/tests/proxy/push_stacked_gerrit.t
@@ -134,7 +134,7 @@ Make sure all temporary namespace got removed
   "real_repo.git" = ["::sub1/"]
   .
   |-- josh
-  |   `-- 19
+  |   `-- 20
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/push_stacked_split.t b/tests/proxy/push_stacked_split.t
index b0398820..2c666541 100644
--- a/tests/proxy/push_stacked_split.t
+++ b/tests/proxy/push_stacked_split.t
@@ -76,7 +76,7 @@ Make sure all temporary namespace got removed
   "real_repo.git" = ["::sub1/"]
   .
   |-- josh
-  |   `-- 19
+  |   `-- 20
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/push_stacked_sub.t b/tests/proxy/push_stacked_sub.t
index b07890d7..d6dc50e5 100644
--- a/tests/proxy/push_stacked_sub.t
+++ b/tests/proxy/push_stacked_sub.t
@@ -132,7 +132,7 @@ Make sure all temporary namespace got removed
   ]
   .
   |-- josh
-  |   `-- 19
+  |   `-- 20
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/push_subdir_prefix.t b/tests/proxy/push_subdir_prefix.t
index 9bd1b98e..32058ca6 100644
--- a/tests/proxy/push_subdir_prefix.t
+++ b/tests/proxy/push_subdir_prefix.t
@@ -48,7 +48,7 @@
   ]
   .
   |-- josh
-  |   `-- 19
+  |   `-- 20
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/push_subtree.t b/tests/proxy/push_subtree.t
index 10f2758c..746f6ca4 100644
--- a/tests/proxy/push_subtree.t
+++ b/tests/proxy/push_subtree.t
@@ -90,7 +90,7 @@ Make sure all temporary namespace got removed
   ]
   .
   |-- josh
-  |   `-- 19
+  |   `-- 20
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/push_subtree_two_repos.t b/tests/proxy/push_subtree_two_repos.t
index db48d4d9..533d0d6d 100644
--- a/tests/proxy/push_subtree_two_repos.t
+++ b/tests/proxy/push_subtree_two_repos.t
@@ -118,7 +118,7 @@ Put a double slash in the URL to see that it also works
   ]
   .
   |-- josh
-  |   `-- 19
+  |   `-- 20
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/unrelated_leak.t b/tests/proxy/unrelated_leak.t
index cc03a84c..2d94c816 100644
--- a/tests/proxy/unrelated_leak.t
+++ b/tests/proxy/unrelated_leak.t
@@ -133,7 +133,7 @@ Flushed credential cache
   ]
   .
   |-- josh
-  |   `-- 19
+  |   `-- 20
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/workspace.t b/tests/proxy/workspace.t
index ac74070e..eb4ad57c 100644
--- a/tests/proxy/workspace.t
+++ b/tests/proxy/workspace.t
@@ -225,7 +225,7 @@
   ]
   .
   |-- josh
-  |   `-- 19
+  |   `-- 20
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/workspace_create.t b/tests/proxy/workspace_create.t
index 21c8cbb7..e904bc1a 100644
--- a/tests/proxy/workspace_create.t
+++ b/tests/proxy/workspace_create.t
@@ -442,7 +442,7 @@ Note that ws/d/ is now present in the ws
   ]
   .
   |-- josh
-  |   `-- 19
+  |   `-- 20
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/workspace_discover.t b/tests/proxy/workspace_discover.t
index 51df2b34..e9aea3f9 100644
--- a/tests/proxy/workspace_discover.t
+++ b/tests/proxy/workspace_discover.t
@@ -102,7 +102,7 @@
   ]
   .
   |-- josh
-  |   `-- 19
+  |   `-- 20
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/workspace_edit_commit.t b/tests/proxy/workspace_edit_commit.t
index 5b1fe40c..4eba79b0 100644
--- a/tests/proxy/workspace_edit_commit.t
+++ b/tests/proxy/workspace_edit_commit.t
@@ -181,7 +181,7 @@
   ]
   .
   |-- josh
-  |   `-- 19
+  |   `-- 20
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/workspace_in_workspace.t b/tests/proxy/workspace_in_workspace.t
index c85aad10..a950511c 100644
--- a/tests/proxy/workspace_in_workspace.t
+++ b/tests/proxy/workspace_in_workspace.t
@@ -245,7 +245,7 @@
   ]
   .
   |-- josh
-  |   `-- 19
+  |   `-- 20
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/workspace_invalid_trailing_slash.t b/tests/proxy/workspace_invalid_trailing_slash.t
index 53c12dbf..fbba5c5f 100644
--- a/tests/proxy/workspace_invalid_trailing_slash.t
+++ b/tests/proxy/workspace_invalid_trailing_slash.t
@@ -184,7 +184,7 @@ Flushed credential cache
   ]
   .
   |-- josh
-  |   `-- 19
+  |   `-- 20
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/workspace_modify.t b/tests/proxy/workspace_modify.t
index 15bbd077..f467df3f 100644
--- a/tests/proxy/workspace_modify.t
+++ b/tests/proxy/workspace_modify.t
@@ -441,7 +441,7 @@ Note that ws/d/ is now present in the ws
   ]
   .
   |-- josh
-  |   `-- 19
+  |   `-- 20
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/workspace_modify_chain.t b/tests/proxy/workspace_modify_chain.t
index 81017c4d..1a3e508d 100644
--- a/tests/proxy/workspace_modify_chain.t
+++ b/tests/proxy/workspace_modify_chain.t
@@ -249,7 +249,7 @@
   ]
   .
   |-- josh
-  |   `-- 19
+  |   `-- 20
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/workspace_modify_chain_prefix_subtree.t b/tests/proxy/workspace_modify_chain_prefix_subtree.t
index 5c784fd1..129aecb9 100644
--- a/tests/proxy/workspace_modify_chain_prefix_subtree.t
+++ b/tests/proxy/workspace_modify_chain_prefix_subtree.t
@@ -304,7 +304,7 @@ Note that ws/d/ is now present in the ws
   ]
   .
   |-- josh
-  |   `-- 19
+  |   `-- 20
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/workspace_pre_history.t b/tests/proxy/workspace_pre_history.t
index f04e4397..867bc016 100644
--- a/tests/proxy/workspace_pre_history.t
+++ b/tests/proxy/workspace_pre_history.t
@@ -88,7 +88,7 @@ file was created
   ]
   .
   |-- josh
-  |   `-- 19
+  |   `-- 20
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/workspace_publish.t b/tests/proxy/workspace_publish.t
index f70f4f94..3b05b434 100644
--- a/tests/proxy/workspace_publish.t
+++ b/tests/proxy/workspace_publish.t
@@ -125,7 +125,7 @@
   ]
   .
   |-- josh
-  |   `-- 19
+  |   `-- 20
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/workspace_tags.t b/tests/proxy/workspace_tags.t
index 5d388fef..86801043 100644
--- a/tests/proxy/workspace_tags.t
+++ b/tests/proxy/workspace_tags.t
@@ -231,7 +231,7 @@
   ]
   .
   |-- josh
-  |   `-- 19
+  |   `-- 20
   |       `-- sled
   |           |-- blobs
   |           |-- conf