From a287bc67be17b7d3666d83119f7fc49f6df725c6 Mon Sep 17 00:00:00 2001
From: Christian Schilling <christian.schilling.de@gmail.com>
Date: Thu, 25 Aug 2022 10:27:20 +0200
Subject: [PATCH] Prevent re-mapping of workspace file

For workspace reversal to work, the mapped location of the
workspace.josh file must always be the root of the workspace.
Previously it was possible to change this by adding a mapping to
the file itself, breaking push.

Change-Id: no-workspace-remap
---
 src/cache.rs                                  |  2 +-
 src/filter/mod.rs                             | 10 ++--
 tests/filter/workspace_unique.t               |  6 +++
 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_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/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/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_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                | 50 ++++++++++++++-----
 tests/proxy/workspace_discover.t              |  2 +-
 tests/proxy/workspace_edit_commit.t           |  8 +--
 tests/proxy/workspace_in_workspace.t          |  2 +-
 .../proxy/workspace_invalid_trailing_slash.t  |  2 +-
 tests/proxy/workspace_modify.t                | 40 +++++++++++----
 tests/proxy/workspace_modify_chain.t          | 37 ++++++++++----
 .../workspace_modify_chain_prefix_subtree.t   | 40 +++++++++++----
 tests/proxy/workspace_pre_history.t           | 14 +++++-
 tests/proxy/workspace_publish.t               |  9 ++--
 tests/proxy/workspace_tags.t                  |  2 +-
 47 files changed, 197 insertions(+), 95 deletions(-)

diff --git a/src/cache.rs b/src/cache.rs
index e345861db..4671d6640 100644
--- a/src/cache.rs
+++ b/src/cache.rs
@@ -1,7 +1,7 @@
 use super::*;
 use std::collections::HashMap;
 
-const CACHE_VERSION: u64 = 11;
+const CACHE_VERSION: u64 = 12;
 
 lazy_static! {
     static ref DB: std::sync::Mutex<Option<sled::Db>> = std::sync::Mutex::new(None);
diff --git a/src/filter/mod.rs b/src/filter/mod.rs
index 63b35c8e9..93d9f637c 100644
--- a/src/filter/mod.rs
+++ b/src/filter/mod.rs
@@ -583,10 +583,12 @@ fn apply2<'a>(
         Op::Invert => tree::invert_paths(transaction, "", tree),
 
         Op::Workspace(path) => {
+            let wsj_file = to_filter(Op::File(Path::new("workspace.josh").to_owned()));
             let base = to_filter(Op::Subdir(path.to_owned()));
+            let wsj_file = chain(base, wsj_file);
             apply(
                 transaction,
-                compose(get_workspace(repo, &tree, path), base),
+                compose(wsj_file, compose(get_workspace(repo, &tree, path), base)),
                 tree,
             )
         }
@@ -661,8 +663,10 @@ fn unapply_workspace<'a>(
             let original_workspace = get_workspace(transaction.repo(), &parent_tree, path);
 
             let root = to_filter(Op::Subdir(path.to_owned()));
-            let filter = compose(workspace, root);
-            let original_filter = compose(original_workspace, root);
+            let wsj_file = to_filter(Op::File(Path::new("workspace.josh").to_owned()));
+            let wsj_file = chain(root, wsj_file);
+            let filter = compose(wsj_file, compose(workspace, root));
+            let original_filter = compose(wsj_file, compose(original_workspace, root));
             let matching = apply(
                 transaction,
                 chain(original_filter, invert(original_filter)?),
diff --git a/tests/filter/workspace_unique.t b/tests/filter/workspace_unique.t
index 860b93d7a..dd4a19d50 100644
--- a/tests/filter/workspace_unique.t
+++ b/tests/filter/workspace_unique.t
@@ -16,10 +16,14 @@
   $ git commit -m "add file2" 1> /dev/null
 
   $ mkdir ws
+
+Note that we are trying to relocate the workspace.josh file, which is not possible
+so the workspace.josh will still appear in the root of the workspace
   $ cat > ws/workspace.josh <<EOF
   > :/sub1::file1
   > ::sub2/subsub/
   > a = :/sub1
+  > b = ::ws/workspace.josh
   > EOF
   $ git add ws
   $ git commit -m "add ws" 1> /dev/null
@@ -28,6 +32,7 @@
   [1] :/sub1
   [1] :/subsub
   [1] ::file1
+  [1] ::ws/workspace.josh
   [1] :[
       ::file1
       :prefix=a
@@ -42,6 +47,7 @@
           :prefix=a
       ]
       ::sub2/subsub/
+      b = ::ws/workspace.josh
   ]
   [2] :workspace=ws
 
diff --git a/tests/proxy/amend_patchset.t b/tests/proxy/amend_patchset.t
index 8ed915b52..460c92f50 100644
--- a/tests/proxy/amend_patchset.t
+++ b/tests/proxy/amend_patchset.t
@@ -121,7 +121,7 @@
   "real_repo.git" = [':/sub3']
   .
   |-- josh
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/authentication.t b/tests/proxy/authentication.t
index 950bb315b..325966af0 100644
--- a/tests/proxy/authentication.t
+++ b/tests/proxy/authentication.t
@@ -124,7 +124,7 @@
   "real_repo.git" = [':/sub1']
   .
   |-- josh
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/caching.t b/tests/proxy/caching.t
index fc713c60a..fa2b1f775 100644
--- a/tests/proxy/caching.t
+++ b/tests/proxy/caching.t
@@ -48,7 +48,7 @@
   "real_repo.git" = [':/sub1']
   .
   |-- josh
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf
@@ -156,7 +156,7 @@
   "real_repo.git" = [':/sub1']
   .
   |-- josh
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/clone_absent_head.t b/tests/proxy/clone_absent_head.t
index 06cf62d91..c5833829e 100644
--- a/tests/proxy/clone_absent_head.t
+++ b/tests/proxy/clone_absent_head.t
@@ -87,7 +87,7 @@
   $ bash ${TESTDIR}/destroy_test_env.sh
   .
   |-- josh
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/clone_all.t b/tests/proxy/clone_all.t
index 909299bca..c5bc241a2 100644
--- a/tests/proxy/clone_all.t
+++ b/tests/proxy/clone_all.t
@@ -53,7 +53,7 @@
   "real_repo.git" = [':/sub1']
   .
   |-- josh
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/clone_blocked.t b/tests/proxy/clone_blocked.t
index a49cac008..c59d11d23 100644
--- a/tests/proxy/clone_blocked.t
+++ b/tests/proxy/clone_blocked.t
@@ -9,7 +9,7 @@
   $ bash ${TESTDIR}/destroy_test_env.sh
   .
   |-- josh
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/clone_invalid_url.t b/tests/proxy/clone_invalid_url.t
index 510fc1a12..4dfb9487a 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
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/clone_prefix.t b/tests/proxy/clone_prefix.t
index 5c3d47155..232dc9b4b 100644
--- a/tests/proxy/clone_prefix.t
+++ b/tests/proxy/clone_prefix.t
@@ -74,7 +74,7 @@
   ]
   .
   |-- josh
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/clone_sha.t b/tests/proxy/clone_sha.t
index b40f2761e..09005cfbe 100644
--- a/tests/proxy/clone_sha.t
+++ b/tests/proxy/clone_sha.t
@@ -72,7 +72,7 @@
   "real_repo.git" = [':/sub1']
   .
   |-- josh
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/clone_subsubtree.t b/tests/proxy/clone_subsubtree.t
index 89e4a12d5..f412de819 100644
--- a/tests/proxy/clone_subsubtree.t
+++ b/tests/proxy/clone_subsubtree.t
@@ -85,7 +85,7 @@
   ]
   .
   |-- josh
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/clone_subtree.t b/tests/proxy/clone_subtree.t
index bcc2148f6..6900a7fd2 100644
--- a/tests/proxy/clone_subtree.t
+++ b/tests/proxy/clone_subtree.t
@@ -84,7 +84,7 @@
   ]
   .
   |-- josh
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/clone_subtree_no_master.t b/tests/proxy/clone_subtree_no_master.t
index 6bed4c036..7842fda08 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
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/clone_subtree_tags.t b/tests/proxy/clone_subtree_tags.t
index 0653e1d87..45e32bd57 100644
--- a/tests/proxy/clone_subtree_tags.t
+++ b/tests/proxy/clone_subtree_tags.t
@@ -114,7 +114,7 @@
   ]
   .
   |-- josh
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/empty_commit.t b/tests/proxy/empty_commit.t
index 4a80e402c..b2ed7fb9c 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
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/get_version.t b/tests/proxy/get_version.t
index a9514e428..c9c7d2a03 100644
--- a/tests/proxy/get_version.t
+++ b/tests/proxy/get_version.t
@@ -7,7 +7,7 @@
   $ bash ${TESTDIR}/destroy_test_env.sh
   .
   |-- josh
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/import_export.t b/tests/proxy/import_export.t
index 5d5037b80..19a1b3619 100644
--- a/tests/proxy/import_export.t
+++ b/tests/proxy/import_export.t
@@ -300,7 +300,7 @@ Flushed credential cache
   "repo2.git" = [':prefix=repo2']
   .
   |-- josh
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/join_with_merge.t b/tests/proxy/join_with_merge.t
index 60372129a..ab89751f9 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
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/markers.t b/tests/proxy/markers.t
index 16a43a27a..434ba8536 100644
--- a/tests/proxy/markers.t
+++ b/tests/proxy/markers.t
@@ -328,7 +328,7 @@
   ]
   .
   |-- josh
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/no_proxy.t b/tests/proxy/no_proxy.t
index 4dc2afdc6..0465f6b41 100644
--- a/tests/proxy/no_proxy.t
+++ b/tests/proxy/no_proxy.t
@@ -35,7 +35,7 @@
   $ bash ${TESTDIR}/destroy_test_env.sh
   .
   |-- josh
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/push_new_branch.t b/tests/proxy/push_new_branch.t
index 3e1c33db4..c36f27eaf 100644
--- a/tests/proxy/push_new_branch.t
+++ b/tests/proxy/push_new_branch.t
@@ -94,7 +94,7 @@ Check the branch again
   "real_repo.git" = [':/sub']
   .
   |-- josh
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/push_prefix.t b/tests/proxy/push_prefix.t
index 33053c4c2..2e6e9299d 100644
--- a/tests/proxy/push_prefix.t
+++ b/tests/proxy/push_prefix.t
@@ -56,7 +56,7 @@
   ]
   .
   |-- josh
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/push_review.t b/tests/proxy/push_review.t
index be2c4dc20..7e7778d92 100644
--- a/tests/proxy/push_review.t
+++ b/tests/proxy/push_review.t
@@ -84,7 +84,7 @@ Make sure all temporary namespace got removed
   "real_repo.git" = [':/sub1']
   .
   |-- josh
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/push_review_already_in.t b/tests/proxy/push_review_already_in.t
index a146971b7..f00bbf223 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
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/push_review_nop_behind.t b/tests/proxy/push_review_nop_behind.t
index 6d17e57ec..113d7c9bf 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
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/push_review_old.t b/tests/proxy/push_review_old.t
index 04ad99528..5538b6de1 100644
--- a/tests/proxy/push_review_old.t
+++ b/tests/proxy/push_review_old.t
@@ -82,7 +82,7 @@ Flushed credential cache
   "real_repo.git" = [':/sub1']
   .
   |-- josh
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/push_review_topic.t b/tests/proxy/push_review_topic.t
index de880424d..edeb2a537 100644
--- a/tests/proxy/push_review_topic.t
+++ b/tests/proxy/push_review_topic.t
@@ -39,7 +39,7 @@ Make sure all temporary namespace got removed
   "real_repo.git" = [':/sub1']
   .
   |-- josh
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/push_stacked.t b/tests/proxy/push_stacked.t
index 6873a43ea..ad0fab90b 100644
--- a/tests/proxy/push_stacked.t
+++ b/tests/proxy/push_stacked.t
@@ -145,7 +145,7 @@ Make sure all temporary namespace got removed
   ]
   .
   |-- josh
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/push_stacked_sub.t b/tests/proxy/push_stacked_sub.t
index c085e420a..1470d24d0 100644
--- a/tests/proxy/push_stacked_sub.t
+++ b/tests/proxy/push_stacked_sub.t
@@ -129,7 +129,7 @@ Make sure all temporary namespace got removed
   "real_repo.git" = [':/sub1']
   .
   |-- josh
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/push_subdir_prefix.t b/tests/proxy/push_subdir_prefix.t
index 335acf2be..76208c5af 100644
--- a/tests/proxy/push_subdir_prefix.t
+++ b/tests/proxy/push_subdir_prefix.t
@@ -48,7 +48,7 @@
   ]
   .
   |-- josh
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/push_subtree.t b/tests/proxy/push_subtree.t
index 52780705a..c30e2c0c7 100644
--- a/tests/proxy/push_subtree.t
+++ b/tests/proxy/push_subtree.t
@@ -87,7 +87,7 @@ Make sure all temporary namespace got removed
   "real_repo.git" = [':/sub1']
   .
   |-- josh
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/push_subtree_two_repos.t b/tests/proxy/push_subtree_two_repos.t
index ff45b73fe..e411e4f6d 100644
--- a/tests/proxy/push_subtree_two_repos.t
+++ b/tests/proxy/push_subtree_two_repos.t
@@ -112,7 +112,7 @@ Put a double slash in the URL to see that it also works
   "real_repo.git" = [':/sub1']
   .
   |-- josh
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/unrelated_leak.t b/tests/proxy/unrelated_leak.t
index 3f599f42a..50337e099 100644
--- a/tests/proxy/unrelated_leak.t
+++ b/tests/proxy/unrelated_leak.t
@@ -132,7 +132,7 @@ Flushed credential cache
   ]
   .
   |-- josh
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/workspace.t b/tests/proxy/workspace.t
index 987995c20..995ad9e58 100644
--- a/tests/proxy/workspace.t
+++ b/tests/proxy/workspace.t
@@ -225,7 +225,7 @@
   ]
   .
   |-- josh
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/workspace_create.t b/tests/proxy/workspace_create.t
index c361eca5c..84c5e032a 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
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf
@@ -560,9 +560,9 @@ Note that ws/d/ is now present in the ws
       |   `-- exclude
       |-- objects
       |   |-- 00
-      |   |   `-- 3a2970e4c23b64f915025e9adc2e6ed04bc63a
+      |   |   |-- 3a2970e4c23b64f915025e9adc2e6ed04bc63a
+      |   |   `-- b49a990c4dc10c67d8b98761c402436627e716
       |   |-- 02
-      |   |   |-- 634a53b8e05b0a9a8f09db835ab4f35ad0e2e6
       |   |   `-- 668d7af968c8eed910db7539a57b18dd62a50e
       |   |-- 04
       |   |   `-- 28323b9901ac5959af01b8686b2524c671adc1
@@ -573,8 +573,7 @@ Note that ws/d/ is now present in the ws
       |   |-- 0b
       |   |   `-- 976ee9223f2a23c5339d6cb3bda2196dbae6b1
       |   |-- 0c
-      |   |   |-- d4309cc22b5903503a7196f49c24cf358a578a
-      |   |   `-- ee64f3b2f9f9dd40a2b36afdccb728b753659c
+      |   |   `-- d4309cc22b5903503a7196f49c24cf358a578a
       |   |-- 0d
       |   |   |-- c2a5964e4ec35013dac4b0537f1116ea91341c
       |   |   `-- d8698200c1dae7c92c6550607e6affcd91df29
@@ -588,6 +587,8 @@ Note that ws/d/ is now present in the ws
       |   |-- 14
       |   |   |-- 1a3bdf0a2739ded6e233ababff0cd490fd0c56
       |   |   `-- da1560586adda328cca1fbf58c026d6730444f
+      |   |-- 15
+      |   |   `-- e7cf6606c3018b91c26914674c7f5bdb28cc38
       |   |-- 17
       |   |   |-- 039634b139f6fba381ff8bc55b9c5de210f87f
       |   |   `-- ac72002199728c133087acfa6b23009e00a52a
@@ -595,8 +596,15 @@ Note that ws/d/ is now present in the ws
       |   |   `-- b9637ac9437ea11d42632cd65ca2313952c32f
       |   |-- 1b
       |   |   `-- 46698f32d1d1db1eaeb34f8c9037778d65f3a9
+      |   |-- 20
+      |   |   |-- 189c97a0ef53368b7ec335baa7a1b86bd76f8e
+      |   |   `-- a9def92c54ae0f7adcaa32e144e5ac1f182571
       |   |-- 22
       |   |   `-- 0f8fb06cc7988cb683eba1c007b8e8aa1c9474
+      |   |-- 23
+      |   |   `-- d20398ffe09015ada5794763b97c750b61bdc4
+      |   |-- 27
+      |   |   `-- d0eee16bdbe4a1ade0ebf877f97467de3b218e
       |   |-- 28
       |   |   `-- a3e71d163a9eb30c3639b16a16f57077abf29b
       |   |-- 2a
@@ -611,18 +619,28 @@ Note that ws/d/ is now present in the ws
       |   |-- 2f
       |   |   |-- 10c52e8ac3117e818b2b8a527c03d9345104c3
       |   |   `-- 888ca5fb8487446a5718b64ddbd9e644d46b00
+      |   |-- 30
+      |   |   `-- 48804b01e298df4a6e1bc60a1e3b2ca0b016bd
       |   |-- 31
       |   |   `-- efdeb5de300e7a344ebb5b006c0380f2223d45
+      |   |-- 34
+      |   |   `-- 351ebb911446708a5a548ff74365f781980294
       |   |-- 36
       |   |   `-- 52f9baa44258d0f505314830ad37d16eafc981
+      |   |-- 38
+      |   |   `-- b8a2ae02de9bdb715894896a3442d2bc54bc09
       |   |-- 39
       |   |   `-- abfc68c47fd430cd9775fc18c9f93bc391052e
+      |   |-- 3a
+      |   |   `-- 748f0be2a5670c0c282196d3a66620e8599ee5
       |   |-- 40
       |   |   `-- c389b6b248e13f3cb88dcd79467d7396a4489e
       |   |-- 41
       |   |   `-- a263629db0fc09dcc5299c3a2eb3025ece9ea0
       |   |-- 43
       |   |   `-- 52611a9e7c56dfdfeadec043ced6d6ef7a5c33
+      |   |-- 46
+      |   |   `-- bc1eabe4b2029b9fcb661f0d447d8389d17337
       |   |-- 47
       |   |   `-- 8644b35118f1d733b14cafb04c51e5b6579243
       |   |-- 4b
@@ -639,14 +657,15 @@ Note that ws/d/ is now present in the ws
       |   |   `-- 8dd30d5f721bf061d079d3f4375c1621716bb0
       |   |-- 60
       |   |   `-- bd0e180735e169b5c853545d8b1272ed0fc319
-      |   |-- 63
-      |   |   `-- 66535ea7764245934ee9568d0780ba3872b33c
       |   |-- 64
+      |   |   |-- 6fd2c5bfe156d57ba03f62f2fe735ddbb74e22
+      |   |   |-- c3f31fdc78ed998bacd4d6b4fe03b1ace028d1
       |   |   `-- d1f8d32b274d8c1eeb69891931f52b6ade9417
       |   |-- 6a
       |   |   `-- 80a5b3af9023d11cb7f37bc1f80d1d1805bfdb
       |   |-- 6c
-      |   |   `-- 68dd37602c8e2036362ab81b12829c4d6c0867
+      |   |   |-- 68dd37602c8e2036362ab81b12829c4d6c0867
+      |   |   `-- cf5cb2f16bdf3e6967bd4c0c4a3571b6668e97
       |   |-- 6d
       |   |   `-- 4b5c23a94a89c7f26266ccf635647fd4002b19
       |   |-- 70
@@ -694,6 +713,8 @@ Note that ws/d/ is now present in the ws
       |   |   `-- acd82fe2a9b89022d1aee5a580c123a8161f4a
       |   |-- 9c
       |   |   `-- 78c532d93505a2a24430635b342b91db22fee0
+      |   |-- 9d
+      |   |   `-- e3bbb26e2b40f02ca8de195933eb620bbf0b6a
       |   |-- 9e
       |   |   `-- 4d2bcaee240904058a6160e84311667b409b08
       |   |-- 9f
@@ -705,6 +726,8 @@ Note that ws/d/ is now present in the ws
       |   |   `-- c31372c5de4fb705ffdcbf5a4ec5c5103231d9
       |   |-- a8
       |   |   `-- 2dc4c2496b446840754c9dc9f1393b08592b26
+      |   |-- ac
+      |   |   `-- f2103d2724dcae1b16af24901a9abb657a9e32
       |   |-- af
       |   |   `-- 410d4293058c26007526cc7798cfc56472c7f8
       |   |-- b1
@@ -718,6 +741,7 @@ Note that ws/d/ is now present in the ws
       |   |-- b9
       |   |   `-- 90567474f1f8af9784478614483684e88ccf4f
       |   |-- ba
+      |   |   |-- 7e71e9f4937922f7993824e136827d1beac1ed
       |   |   `-- f9dcf1394d5152de67b115f55f25e4dc0a2398
       |   |-- bb
       |   |   `-- 9f40f82fbc8cabcb1aee561cf488412e5f2415
@@ -742,14 +766,16 @@ Note that ws/d/ is now present in the ws
       |   |   `-- e36a04a3c59c966815fae6db6fe5d518a3456a
       |   |-- da
       |   |   `-- af0560e4e779353311a9039b31ea4f0f1dec37
+      |   |-- dc
+      |   |   `-- ffb9b655a4a1d6b9b152917199457d2ddd57cd
       |   |-- e1
+      |   |   |-- 0bf0281a70e6b19939ad6e26e10252bbebe300
       |   |   `-- 25e6d9f8f9acca5ffd25ee3c97d09748ad2a8b
-      |   |-- e2
-      |   |   `-- 4b99efdd25fce896ef9fd0e9614163504c59cd
       |   |-- e7
       |   |   `-- cee3592aaac624fd48c258daa5d62d17352043
       |   |-- e9
-      |   |   `-- 8909530f1ecc7b6438c268e3d6870107450eba
+      |   |   |-- 8909530f1ecc7b6438c268e3d6870107450eba
+      |   |   `-- 9a2c69c0fb10af8dd1524e7f976df3d898f6ac
       |   |-- ea
       |   |   |-- 1ae75547e348b07cb28a721a06ef6580ff67f0
       |   |   `-- 7beb7786b5dbadf54412f90d4e729f41f26c00
@@ -780,6 +806,6 @@ Note that ws/d/ is now present in the ws
           |-- namespaces
           `-- tags
   
-  162 directories, 176 files
+  172 directories, 192 files
 
 $ cat ${TESTTMP}/josh-proxy.out
diff --git a/tests/proxy/workspace_discover.t b/tests/proxy/workspace_discover.t
index ef31085e8..74e2fb478 100644
--- a/tests/proxy/workspace_discover.t
+++ b/tests/proxy/workspace_discover.t
@@ -102,7 +102,7 @@
   ]
   .
   |-- josh
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/workspace_edit_commit.t b/tests/proxy/workspace_edit_commit.t
index 96d1f9588..4c5d28168 100644
--- a/tests/proxy/workspace_edit_commit.t
+++ b/tests/proxy/workspace_edit_commit.t
@@ -181,7 +181,7 @@
   ]
   .
   |-- josh
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf
@@ -296,7 +296,8 @@
       |   |-- 1b
       |   |   `-- 46698f32d1d1db1eaeb34f8c9037778d65f3a9
       |   |-- 1f
-      |   |   `-- 536d8f72fc8763fbab95342ed8013585f1e3b6
+      |   |   |-- 536d8f72fc8763fbab95342ed8013585f1e3b6
+      |   |   `-- 8abd6f6494fc2f715b3c1a39ac2e01ba806938
       |   |-- 20
       |   |   `-- 31777de79cd7c74834915674377e96d6864cc9
       |   |-- 22
@@ -399,6 +400,7 @@
       |   |-- a3
       |   |   `-- c7a71fc22700d5f53defd99609e96296417985
       |   |-- a7
+      |   |   |-- 7106b607ba6489028e85eeec937463cc29c39a
       |   |   `-- cf4e83688bf0ec633d4e4abae4b74dce4852ba
       |   |-- aa
       |   |   `-- 9a76a1ceffe8671346cd7526a4dc86b0d7cc40
@@ -472,4 +474,4 @@
           |-- namespaces
           `-- tags
   
-  148 directories, 143 files
+  148 directories, 145 files
diff --git a/tests/proxy/workspace_in_workspace.t b/tests/proxy/workspace_in_workspace.t
index 323035fb2..354a3c6cc 100644
--- a/tests/proxy/workspace_in_workspace.t
+++ b/tests/proxy/workspace_in_workspace.t
@@ -245,7 +245,7 @@
   ]
   .
   |-- josh
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/workspace_invalid_trailing_slash.t b/tests/proxy/workspace_invalid_trailing_slash.t
index f03adc2c3..a0d65b0c2 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
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf
diff --git a/tests/proxy/workspace_modify.t b/tests/proxy/workspace_modify.t
index 78d99bf89..38ab515aa 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
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf
@@ -570,8 +570,7 @@ Note that ws/d/ is now present in the ws
       |   |-- 0b
       |   |   `-- 976ee9223f2a23c5339d6cb3bda2196dbae6b1
       |   |-- 0c
-      |   |   |-- d4309cc22b5903503a7196f49c24cf358a578a
-      |   |   `-- ee64f3b2f9f9dd40a2b36afdccb728b753659c
+      |   |   `-- d4309cc22b5903503a7196f49c24cf358a578a
       |   |-- 12
       |   |   `-- f49faa307e33da834e082e022f0b5c83d0f3e1
       |   |-- 13
@@ -590,6 +589,8 @@ Note that ws/d/ is now present in the ws
       |   |   `-- 189c97a0ef53368b7ec335baa7a1b86bd76f8e
       |   |-- 21
       |   |   `-- cd34cf0a5b7f59eaa6beab4d2e3d0c76bdf8ac
+      |   |-- 23
+      |   |   `-- d20398ffe09015ada5794763b97c750b61bdc4
       |   |-- 28
       |   |   `-- a3e71d163a9eb30c3639b16a16f57077abf29b
       |   |-- 2a
@@ -604,6 +605,8 @@ Note that ws/d/ is now present in the ws
       |   |-- 2f
       |   |   |-- 10c52e8ac3117e818b2b8a527c03d9345104c3
       |   |   `-- 888ca5fb8487446a5718b64ddbd9e644d46b00
+      |   |-- 30
+      |   |   `-- 48804b01e298df4a6e1bc60a1e3b2ca0b016bd
       |   |-- 31
       |   |   |-- 36fff7280627623bf4d71191d1aea783579be0
       |   |   |-- af3d0a5be6cc36a10a6b984673087c2d068432
@@ -612,8 +615,12 @@ Note that ws/d/ is now present in the ws
       |   |   `-- c24765275d6f3ec5d6baeaaa4299471d6f7df0
       |   |-- 36
       |   |   `-- 52f9baa44258d0f505314830ad37d16eafc981
+      |   |-- 38
+      |   |   `-- b8a2ae02de9bdb715894896a3442d2bc54bc09
       |   |-- 39
       |   |   `-- abfc68c47fd430cd9775fc18c9f93bc391052e
+      |   |-- 3a
+      |   |   `-- 748f0be2a5670c0c282196d3a66620e8599ee5
       |   |-- 40
       |   |   `-- c389b6b248e13f3cb88dcd79467d7396a4489e
       |   |-- 41
@@ -622,6 +629,8 @@ Note that ws/d/ is now present in the ws
       |   |   `-- 52611a9e7c56dfdfeadec043ced6d6ef7a5c33
       |   |-- 44
       |   |   `-- 625a9b34b1c6747c29903c3e641a4b2e580673
+      |   |-- 46
+      |   |   `-- bc1eabe4b2029b9fcb661f0d447d8389d17337
       |   |-- 47
       |   |   `-- 8644b35118f1d733b14cafb04c51e5b6579243
       |   |-- 49
@@ -643,13 +652,14 @@ Note that ws/d/ is now present in the ws
       |   |-- 5f
       |   |   `-- 8dd30d5f721bf061d079d3f4375c1621716bb0
       |   |-- 64
+      |   |   |-- 6fd2c5bfe156d57ba03f62f2fe735ddbb74e22
+      |   |   |-- c3f31fdc78ed998bacd4d6b4fe03b1ace028d1
       |   |   `-- d1f8d32b274d8c1eeb69891931f52b6ade9417
       |   |-- 6a
       |   |   `-- 80a5b3af9023d11cb7f37bc1f80d1d1805bfdb
-      |   |-- 6b
-      |   |   `-- ea49f3ab464fb1795ab9c622aad1047de07d8e
       |   |-- 6c
-      |   |   `-- 68dd37602c8e2036362ab81b12829c4d6c0867
+      |   |   |-- 68dd37602c8e2036362ab81b12829c4d6c0867
+      |   |   `-- cf5cb2f16bdf3e6967bd4c0c4a3571b6668e97
       |   |-- 6d
       |   |   |-- 4b5c23a94a89c7f26266ccf635647fd4002b19
       |   |   `-- 5a5046f3a9591a32ec47bc38a1da879aca6743
@@ -703,6 +713,8 @@ Note that ws/d/ is now present in the ws
       |   |-- 9c
       |   |   |-- 41f84a301918bbba26e7109efa440f973cec2a
       |   |   `-- 78c532d93505a2a24430635b342b91db22fee0
+      |   |-- 9d
+      |   |   `-- e3bbb26e2b40f02ca8de195933eb620bbf0b6a
       |   |-- 9e
       |   |   `-- 4d2bcaee240904058a6160e84311667b409b08
       |   |-- 9f
@@ -714,6 +726,8 @@ Note that ws/d/ is now present in the ws
       |   |   `-- c31372c5de4fb705ffdcbf5a4ec5c5103231d9
       |   |-- ab
       |   |   `-- a295fbe181a47f04650542b7d5582fbd983b98
+      |   |-- ac
+      |   |   `-- f2103d2724dcae1b16af24901a9abb657a9e32
       |   |-- af
       |   |   `-- 410d4293058c26007526cc7798cfc56472c7f8
       |   |-- b1
@@ -724,6 +738,7 @@ Note that ws/d/ is now present in the ws
       |   |-- b9
       |   |   `-- 90567474f1f8af9784478614483684e88ccf4f
       |   |-- ba
+      |   |   |-- 7e71e9f4937922f7993824e136827d1beac1ed
       |   |   `-- f9dcf1394d5152de67b115f55f25e4dc0a2398
       |   |-- bc
       |   |   `-- 665856e841c4ae4a956483dc57b2ea4cc20116
@@ -739,19 +754,22 @@ Note that ws/d/ is now present in the ws
       |   |   `-- 330ea337031af43ba1cf6982a873a40b9170ac
       |   |-- da
       |   |   `-- af0560e4e779353311a9039b31ea4f0f1dec37
+      |   |-- dc
+      |   |   `-- ffb9b655a4a1d6b9b152917199457d2ddd57cd
       |   |-- e1
+      |   |   |-- 0bf0281a70e6b19939ad6e26e10252bbebe300
       |   |   `-- 25e6d9f8f9acca5ffd25ee3c97d09748ad2a8b
-      |   |-- e2
-      |   |   `-- 4b99efdd25fce896ef9fd0e9614163504c59cd
       |   |-- e7
       |   |   `-- cee3592aaac624fd48c258daa5d62d17352043
+      |   |-- e8
+      |   |   `-- f852fc8816a734b2dd9ffb1a6bb7b92db1af84
       |   |-- e9
-      |   |   `-- 8909530f1ecc7b6438c268e3d6870107450eba
+      |   |   |-- 8909530f1ecc7b6438c268e3d6870107450eba
+      |   |   `-- 9a2c69c0fb10af8dd1524e7f976df3d898f6ac
       |   |-- ea
       |   |   |-- 1ae75547e348b07cb28a721a06ef6580ff67f0
       |   |   `-- 7beb7786b5dbadf54412f90d4e729f41f26c00
       |   |-- ec
-      |   |   |-- 3fdddf2a63a195676075359997b74b8394cd72
       |   |   `-- 4f59ca1a0ac5b2f375d4917dbba5e6aedff12a
       |   |-- ee
       |   |   `-- b52a9c8fe143baf970160aa4716ff5c019d8cb
@@ -778,6 +796,6 @@ Note that ws/d/ is now present in the ws
           |-- namespaces
           `-- tags
   
-  162 directories, 175 files
+  169 directories, 186 files
 
 $ cat ${TESTTMP}/josh-proxy.out
diff --git a/tests/proxy/workspace_modify_chain.t b/tests/proxy/workspace_modify_chain.t
index 1a3f6f290..f61850f6f 100644
--- a/tests/proxy/workspace_modify_chain.t
+++ b/tests/proxy/workspace_modify_chain.t
@@ -249,7 +249,7 @@
   ]
   .
   |-- josh
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf
@@ -346,6 +346,8 @@
       |   |   `-- 28323b9901ac5959af01b8686b2524c671adc1
       |   |-- 05
       |   |   `-- 57735d7abe36fcec6cdb31800640a030618fcf
+      |   |-- 09
+      |   |   `-- 6bc6746f7ce0618d1d9794c9e3e29df9af51fc
       |   |-- 0b
       |   |   `-- 976ee9223f2a23c5339d6cb3bda2196dbae6b1
       |   |-- 0c
@@ -359,7 +361,9 @@
       |   |-- 17
       |   |   `-- b82a3b31749dc7d6dbc5a528eb19a103a5bdb9
       |   |-- 1d
-      |   |   `-- 6d81877130bc5a54c8ea27e8497f838cfe9aa3
+      |   |   |-- 66bba385306f617f7af4c77334c4c9e0be7637
+      |   |   |-- 6d81877130bc5a54c8ea27e8497f838cfe9aa3
+      |   |   `-- ff8a2dce92f202d13c5995a0f898b6cfba26c9
       |   |-- 20
       |   |   `-- 5dccdc2e37df9aaccec46009520154219134e7
       |   |-- 27
@@ -369,8 +373,12 @@
       |   |-- 2a
       |   |   |-- 03ad0fe1720ee0afc95ba8e1bc38a35b87983f
       |   |   `-- 3e798288165d5b090a10460984776489bcc7cc
+      |   |-- 2b
+      |   |   `-- 158ac79b2dae332577be854a9fc8fb558f13f9
       |   |-- 2c
       |   |   `-- fb80c68126f24a61b2778ce3f55d65d93f5e90
+      |   |-- 2d
+      |   |   `-- b4c60cceb3afe11f40f945c01dd5cd513f5653
       |   |-- 2f
       |   |   |-- 10c52e8ac3117e818b2b8a527c03d9345104c3
       |   |   `-- 888ca5fb8487446a5718b64ddbd9e644d46b00
@@ -383,8 +391,6 @@
       |   |-- 39
       |   |   |-- 0caf88590ab9ce40b6092c82a5f5e68041e4a6
       |   |   `-- abfc68c47fd430cd9775fc18c9f93bc391052e
-      |   |-- 3d
-      |   |   `-- fa0c895e0725543219faa20e3ffbadcee13de4
       |   |-- 43
       |   |   `-- 52611a9e7c56dfdfeadec043ced6d6ef7a5c33
       |   |-- 46
@@ -393,6 +399,8 @@
       |   |   `-- 8644b35118f1d733b14cafb04c51e5b6579243
       |   |-- 4b
       |   |   `-- 825dc642cb6eb9a060e54bf8d69288fbee4904
+      |   |-- 4f
+      |   |   `-- 314491719dffbb4340268e5f04136e74821e2c
       |   |-- 53
       |   |   `-- 0148978e42a91926dbe2f5fe0c71fe63aacf8e
       |   |-- 5a
@@ -400,6 +408,7 @@
       |   |-- 5b
       |   |   `-- 545e12c5b297509b8d99df5f0b952a2dd7862d
       |   |-- 64
+      |   |   |-- 37740d4a4b07d7cec1dbc8e15a0e8c4c3d1fc1
       |   |   |-- 6fd2c5bfe156d57ba03f62f2fe735ddbb74e22
       |   |   `-- d1f8d32b274d8c1eeb69891931f52b6ade9417
       |   |-- 67
@@ -416,16 +425,24 @@
       |   |   `-- 1ecd943cf17e1530017a1db8006771d6c5c4d4
       |   |-- 78
       |   |   `-- 2f6261fa32f8bfec7b89f77bb5cce40c4611cb
-      |   |-- 7a
-      |   |   `-- f95bc6e271a8e8153770db325e6df3581f3182
       |   |-- 7c
       |   |   `-- 30b7adfa79351301a11882adf49f438ec294f8
       |   |-- 7f
       |   |   `-- c8ee5474068055f7740240dfce6fa6e38bbf4d
       |   |-- 89
       |   |   `-- 8b763a1483259f4667f399a019b96f52a28f8c
+      |   |-- 8a
+      |   |   `-- bb8094049472170b402ad3aaee6db3d5a97286
+      |   |-- 8f
+      |   |   `-- b3ed01208c73e957a8f0be3aedea504e20f63a
+      |   |-- 91
+      |   |   `-- 584adddb4f190d805ec45ce500a0661671fb25
+      |   |-- 92
+      |   |   `-- 3066e5933b298132b6b94f406a7f9ae1892cef
       |   |-- 93
       |   |   `-- f66d258b7b4c3757e63f985b08f7daa33db64e
+      |   |-- 96
+      |   |   `-- 70eeef8f2338120425572c691f0a9139294db1
       |   |-- 98
       |   |   `-- 84cc2efe368ea0aa9d912fa596b26c5d75dbee
       |   |-- 99
@@ -460,8 +477,6 @@
       |   |-- bc
       |   |   |-- 61a0ff30ea25db7bcfc9a67fdae747904ed55f
       |   |   `-- 665856e841c4ae4a956483dc57b2ea4cc20116
-      |   |-- bf
-      |   |   `-- 3f93ef98d196c9a282daaca6658c11799510c3
       |   |-- c1
       |   |   `-- 489fc8fd6ae9ac08c0168d7cabaf5645b922fa
       |   |-- c2
@@ -477,6 +492,8 @@
       |   |   `-- 94016e24d97a10d550de2384527f80f9fecfc8
       |   |-- e1
       |   |   `-- 25e6d9f8f9acca5ffd25ee3c97d09748ad2a8b
+      |   |-- e5
+      |   |   `-- f5b3645e5400bd404016c5111c18c3942f02e7
       |   |-- e8
       |   |   `-- d34a664c80ff36cdff2c41c1fd3964f6e30f00
       |   |-- ea
@@ -497,8 +514,6 @@
       |   |   `-- 7930069cbf71e47b72fb4e5ede3dff15123884
       |   |-- fa
       |   |   `-- 1745f6c84f945b51a305aa9751c466e26fb78a
-      |   |-- ff
-      |   |   `-- 207ba6445d9963e77bc387044ee63bd9ea7387
       |   |-- info
       |   `-- pack
       `-- refs
@@ -506,6 +521,6 @@
           |-- namespaces
           `-- tags
   
-  129 directories, 128 files
+  135 directories, 137 files
 
 $ cat ${TESTTMP}/josh-proxy.out | grep VIEW
diff --git a/tests/proxy/workspace_modify_chain_prefix_subtree.t b/tests/proxy/workspace_modify_chain_prefix_subtree.t
index 2a00d5b68..7f5234515 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
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf
@@ -431,8 +431,7 @@ Note that ws/d/ is now present in the ws
       |   |   `-- 976ee9223f2a23c5339d6cb3bda2196dbae6b1
       |   |-- 0c
       |   |   |-- 66ddcaed3f256f7dacc400a684aa1b91ac638f
-      |   |   |-- d4309cc22b5903503a7196f49c24cf358a578a
-      |   |   `-- ee64f3b2f9f9dd40a2b36afdccb728b753659c
+      |   |   `-- d4309cc22b5903503a7196f49c24cf358a578a
       |   |-- 12
       |   |   `-- f49faa307e33da834e082e022f0b5c83d0f3e1
       |   |-- 13
@@ -449,6 +448,8 @@ Note that ws/d/ is now present in the ws
       |   |   `-- 189c97a0ef53368b7ec335baa7a1b86bd76f8e
       |   |-- 22
       |   |   `-- b3eaf7b374287220ac787fd2bce5958b69115c
+      |   |-- 23
+      |   |   `-- d20398ffe09015ada5794763b97c750b61bdc4
       |   |-- 27
       |   |   `-- 5b45aec0a1c944c3a4c71cc71ee08d0c9ea347
       |   |-- 28
@@ -463,6 +464,8 @@ Note that ws/d/ is now present in the ws
       |   |-- 2f
       |   |   |-- 10c52e8ac3117e818b2b8a527c03d9345104c3
       |   |   `-- 888ca5fb8487446a5718b64ddbd9e644d46b00
+      |   |-- 30
+      |   |   `-- 48804b01e298df4a6e1bc60a1e3b2ca0b016bd
       |   |-- 31
       |   |   |-- af3d0a5be6cc36a10a6b984673087c2d068432
       |   |   `-- efdeb5de300e7a344ebb5b006c0380f2223d45
@@ -470,8 +473,12 @@ Note that ws/d/ is now present in the ws
       |   |   `-- c24765275d6f3ec5d6baeaaa4299471d6f7df0
       |   |-- 36
       |   |   `-- 52f9baa44258d0f505314830ad37d16eafc981
+      |   |-- 38
+      |   |   `-- b8a2ae02de9bdb715894896a3442d2bc54bc09
       |   |-- 39
       |   |   `-- abfc68c47fd430cd9775fc18c9f93bc391052e
+      |   |-- 3a
+      |   |   `-- 748f0be2a5670c0c282196d3a66620e8599ee5
       |   |-- 40
       |   |   `-- c389b6b248e13f3cb88dcd79467d7396a4489e
       |   |-- 41
@@ -481,6 +488,8 @@ Note that ws/d/ is now present in the ws
       |   |-- 44
       |   |   |-- 625a9b34b1c6747c29903c3e641a4b2e580673
       |   |   `-- edc62d506b9805a3edfc74db15b1cc0bfc6871
+      |   |-- 46
+      |   |   `-- bc1eabe4b2029b9fcb661f0d447d8389d17337
       |   |-- 47
       |   |   `-- 8644b35118f1d733b14cafb04c51e5b6579243
       |   |-- 4b
@@ -496,6 +505,8 @@ Note that ws/d/ is now present in the ws
       |   |-- 5f
       |   |   `-- 8dd30d5f721bf061d079d3f4375c1621716bb0
       |   |-- 64
+      |   |   |-- 6fd2c5bfe156d57ba03f62f2fe735ddbb74e22
+      |   |   |-- c3f31fdc78ed998bacd4d6b4fe03b1ace028d1
       |   |   `-- d1f8d32b274d8c1eeb69891931f52b6ade9417
       |   |-- 65
       |   |   `-- 786136396010946815eff820697a6d0578c113
@@ -503,10 +514,9 @@ Note that ws/d/ is now present in the ws
       |   |   `-- 12cb1b8c89e3b2272182f140c81aef3b718671
       |   |-- 6a
       |   |   `-- 80a5b3af9023d11cb7f37bc1f80d1d1805bfdb
-      |   |-- 6b
-      |   |   `-- ea49f3ab464fb1795ab9c622aad1047de07d8e
       |   |-- 6c
-      |   |   `-- 68dd37602c8e2036362ab81b12829c4d6c0867
+      |   |   |-- 68dd37602c8e2036362ab81b12829c4d6c0867
+      |   |   `-- cf5cb2f16bdf3e6967bd4c0c4a3571b6668e97
       |   |-- 6d
       |   |   |-- 4b5c23a94a89c7f26266ccf635647fd4002b19
       |   |   `-- 5a5046f3a9591a32ec47bc38a1da879aca6743
@@ -553,6 +563,8 @@ Note that ws/d/ is now present in the ws
       |   |   `-- acd82fe2a9b89022d1aee5a580c123a8161f4a
       |   |-- 9c
       |   |   `-- 78c532d93505a2a24430635b342b91db22fee0
+      |   |-- 9d
+      |   |   `-- e3bbb26e2b40f02ca8de195933eb620bbf0b6a
       |   |-- 9e
       |   |   `-- 4d2bcaee240904058a6160e84311667b409b08
       |   |-- 9f
@@ -565,6 +577,8 @@ Note that ws/d/ is now present in the ws
       |   |   `-- b68220bdf7fb846eb9780f7846a2f4bf7cbcc3
       |   |-- ab
       |   |   `-- a295fbe181a47f04650542b7d5582fbd983b98
+      |   |-- ac
+      |   |   `-- f2103d2724dcae1b16af24901a9abb657a9e32
       |   |-- af
       |   |   `-- 410d4293058c26007526cc7798cfc56472c7f8
       |   |-- b1
@@ -574,6 +588,7 @@ Note that ws/d/ is now present in the ws
       |   |-- b9
       |   |   `-- 90567474f1f8af9784478614483684e88ccf4f
       |   |-- ba
+      |   |   |-- 7e71e9f4937922f7993824e136827d1beac1ed
       |   |   `-- f9dcf1394d5152de67b115f55f25e4dc0a2398
       |   |-- bc
       |   |   `-- 665856e841c4ae4a956483dc57b2ea4cc20116
@@ -585,19 +600,22 @@ Note that ws/d/ is now present in the ws
       |   |   `-- bceb2fb07839b8796fadb2b6a8b785b8fd7440
       |   |-- d7
       |   |   `-- 330ea337031af43ba1cf6982a873a40b9170ac
+      |   |-- dc
+      |   |   `-- ffb9b655a4a1d6b9b152917199457d2ddd57cd
       |   |-- e1
+      |   |   |-- 0bf0281a70e6b19939ad6e26e10252bbebe300
       |   |   `-- 25e6d9f8f9acca5ffd25ee3c97d09748ad2a8b
-      |   |-- e2
-      |   |   `-- 4b99efdd25fce896ef9fd0e9614163504c59cd
       |   |-- e7
       |   |   `-- cee3592aaac624fd48c258daa5d62d17352043
+      |   |-- e8
+      |   |   `-- f852fc8816a734b2dd9ffb1a6bb7b92db1af84
       |   |-- e9
-      |   |   `-- 8909530f1ecc7b6438c268e3d6870107450eba
+      |   |   |-- 8909530f1ecc7b6438c268e3d6870107450eba
+      |   |   `-- 9a2c69c0fb10af8dd1524e7f976df3d898f6ac
       |   |-- ea
       |   |   |-- 1ae75547e348b07cb28a721a06ef6580ff67f0
       |   |   `-- 7beb7786b5dbadf54412f90d4e729f41f26c00
       |   |-- ec
-      |   |   |-- 3fdddf2a63a195676075359997b74b8394cd72
       |   |   `-- 4f59ca1a0ac5b2f375d4917dbba5e6aedff12a
       |   |-- ed
       |   |   `-- efd7dc70381a72b7af5bff2e49b8eb60cb9237
@@ -622,6 +640,6 @@ Note that ws/d/ is now present in the ws
           |-- namespaces
           `-- tags
   
-  154 directories, 164 files
+  161 directories, 175 files
 
 $ cat ${TESTTMP}/josh-proxy.out | grep VIEW
diff --git a/tests/proxy/workspace_pre_history.t b/tests/proxy/workspace_pre_history.t
index bdfea2d42..ca35e37c5 100644
--- a/tests/proxy/workspace_pre_history.t
+++ b/tests/proxy/workspace_pre_history.t
@@ -88,7 +88,7 @@ file was created
   ]
   .
   |-- josh
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf
@@ -148,6 +148,8 @@ file was created
       |-- objects
       |   |-- 06
       |   |   `-- f56dd7e7b5abf977267595ccfc3f1a5f1eea28
+      |   |-- 27
+      |   |   `-- 5b45aec0a1c944c3a4c71cc71ee08d0c9ea347
       |   |-- 4b
       |   |   `-- 825dc642cb6eb9a060e54bf8d69288fbee4904
       |   |-- 4f
@@ -156,10 +158,18 @@ file was created
       |   |   `-- 2f6261fa32f8bfec7b89f77bb5cce40c4611cb
       |   |-- 98
       |   |   `-- 84cc2efe368ea0aa9d912fa596b26c5d75dbee
+      |   |-- 9c
+      |   |   `-- f258b407cd9cdba97e16a293582b29d302b796
       |   |-- a8
       |   |   `-- 6544ef29b946481d26cb4cfb55844342069c0e
+      |   |-- b6
+      |   |   `-- c8440fe2cd36638ddb6b3505c1e8f2202f6191
+      |   |-- b8
+      |   |   `-- c113355111088cf7e591a20df6dabe2db24c92
       |   |-- eb
       |   |   `-- 6a31166c5bf0dbb65c82f89130976a12533ce6
+      |   |-- f8
+      |   |   `-- 5eaa207c7aba64f4deb19a9acd060c254fb239
       |   |-- info
       |   `-- pack
       `-- refs
@@ -167,6 +177,6 @@ file was created
           |-- namespaces
           `-- tags
   
-  46 directories, 33 files
+  51 directories, 38 files
 
 $ cat ${TESTTMP}/josh-proxy.out | grep VIEW
diff --git a/tests/proxy/workspace_publish.t b/tests/proxy/workspace_publish.t
index 69a67f19b..7e70474cd 100644
--- a/tests/proxy/workspace_publish.t
+++ b/tests/proxy/workspace_publish.t
@@ -125,7 +125,7 @@
   ]
   .
   |-- josh
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf
@@ -257,6 +257,8 @@
       |   |   `-- 489fc8fd6ae9ac08c0168d7cabaf5645b922fa
       |   |-- c2
       |   |   `-- d86319b61f31a7f4f1bc89b8ea4356b60c4658
+      |   |-- c4
+      |   |   `-- c85b2c5c47af364fa064bd2b6523fe98ed3852
       |   |-- d3
       |   |   `-- d2a4d6db7addc2b087dcdb3e63785d3315c00e
       |   |-- d7
@@ -269,7 +271,8 @@
       |   |-- f5
       |   |   `-- d0c4d5fe3173ba8ca39fc198658487eaab8014
       |   |-- f6
-      |   |   `-- 3dd93419493d22aeaf6bcb5c0bec4c2701b049
+      |   |   |-- 3dd93419493d22aeaf6bcb5c0bec4c2701b049
+      |   |   `-- e8ded2e63ba78ef5e9c02679331383cc4b2203
       |   |-- info
       |   `-- pack
       `-- refs
@@ -277,6 +280,6 @@
           |-- namespaces
           `-- tags
   
-  81 directories, 71 files
+  82 directories, 73 files
 
 $ cat ${TESTTMP}/josh-proxy.out | grep VIEW
diff --git a/tests/proxy/workspace_tags.t b/tests/proxy/workspace_tags.t
index 8f7f66931..713311459 100644
--- a/tests/proxy/workspace_tags.t
+++ b/tests/proxy/workspace_tags.t
@@ -232,7 +232,7 @@
   ]
   .
   |-- josh
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf