From 76746b6ddc545cd12ee3dd892047240246849ff7 Mon Sep 17 00:00:00 2001 From: Christian Schilling Date: Fri, 2 Sep 2022 12:30:29 +0200 Subject: [PATCH] Use "Change" instead of "Change-Id" for changes mechanisms This way "Change-Id" can return to it's original purpose of being globally unique. Change-Id: change-label --- josh-proxy/src/lib.rs | 38 +++++++++---------- src/lib.rs | 31 ++++++++++------ tests/proxy/push_stacked.t | 64 ++++++++++++++++---------------- tests/proxy/push_stacked_split.t | 63 ++++++++++++++++--------------- tests/proxy/push_stacked_sub.t | 49 ++++++++++++------------ 5 files changed, 124 insertions(+), 121 deletions(-) diff --git a/josh-proxy/src/lib.rs b/josh-proxy/src/lib.rs index f719e5f66..3d264bd46 100644 --- a/josh-proxy/src/lib.rs +++ b/josh-proxy/src/lib.rs @@ -158,7 +158,7 @@ pub fn process_repo_update(repo_update: RepoUpdate) -> josh::JoshResult None }; - let mut change_ids = if push_mode == PushMode::Stack || push_mode == PushMode::Split { + let mut changes = if push_mode == PushMode::Stack || push_mode == PushMode::Split { Some(vec![]) } else { None @@ -179,7 +179,7 @@ pub fn process_repo_update(repo_update: RepoUpdate) -> josh::JoshResult new_oid, josh_merge, reparent_orphans, - &mut change_ids, + &mut changes, )? }; @@ -222,9 +222,9 @@ pub fn process_repo_update(repo_update: RepoUpdate) -> josh::JoshResult "".to_string() }; - let to_push = if let Some(change_ids) = change_ids { + let to_push = if let Some(changes) = changes { let mut v = vec![]; - v.append(&mut change_ids_to_refs(&baseref, &author, change_ids)?); + v.append(&mut changes_to_refs(&baseref, &author, changes)?); if push_mode == PushMode::Split { split_changes(transaction.repo(), &mut v, old)?; @@ -608,41 +608,41 @@ impl Drop for TmpGitNamespace { } } -fn change_ids_to_refs( +fn changes_to_refs( baseref: &str, change_author: &str, - change_ids: Vec, + changes: Vec, ) -> josh::JoshResult> { let mut seen = vec![]; - let mut change_ids = change_ids; - change_ids.retain(|change| change.author == change_author); + let mut changes = changes; + changes.retain(|change| change.author == change_author); if !change_author.contains('@') { return Err(josh::josh_error( "Push option 'author' needs to be set to a valid email address", )); }; - for change in change_ids.iter() { - if let Some(id) = &change.id { - if id.contains('@') { - return Err(josh::josh_error("Change-Id must not contain '@'")); + for change in changes.iter() { + if let Some(label) = &change.label { + if label.contains('@') { + return Err(josh::josh_error("Change label must not contain '@'")); } - if seen.contains(&id) { + if seen.contains(&label) { return Err(josh::josh_error(&format!( - "rejecting to push {:?} with duplicate Change-Id", + "rejecting to push {:?} with duplicate label", change.commit ))); } - seen.push(&id); + seen.push(&label); } else { return Err(josh::josh_error(&format!( - "rejecting to push {:?} without Change-Id", + "rejecting to push {:?} without label", change.commit ))); } } - Ok(change_ids + Ok(changes .iter() .map(|change| { ( @@ -650,11 +650,11 @@ fn change_ids_to_refs( "refs/heads/@changes/{}/{}/{}", baseref.replacen("refs/heads/", "", 1), change.author, - change.id.as_ref().unwrap_or(&"".to_string()), + change.label.as_ref().unwrap_or(&"".to_string()), ), change.commit, change - .id + .label .as_ref() .unwrap_or(&"JOSH_PUSH".to_string()) .to_string(), diff --git a/src/lib.rs b/src/lib.rs index ec5f26df2..1eae62266 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -48,9 +48,21 @@ pub mod shell; pub struct Change { pub author: String, pub id: Option, + pub label: Option, pub commit: git2::Oid, } +impl Change { + fn new(commit: git2::Oid) -> Self { + Self { + author: Default::default(), + label: Default::default(), + id: Default::default(), + commit: commit, + } + } +} + pub const VERSION: &str = git_version::git_version!(args = ["--tags", "--always", "--dirty=-modified"]); @@ -150,21 +162,18 @@ lazy_static! { } pub fn get_change_id(commit: &git2::Commit, sha: git2::Oid) -> Change { + let mut change = Change::new(sha); + change.author = commit.author().email().unwrap_or("").to_string(); + for line in commit.message().unwrap_or("").split('\n') { if line.starts_with("Change-Id: ") { - let id = line.replace("Change-Id: ", ""); - return Change { - author: commit.author().email().unwrap_or("").to_string(), - id: Some(id), - commit: sha, - }; + change.id = Some(line.replacen("Change-Id: ", "", 1)); + } + if line.starts_with("Change: ") { + change.label = Some(line.replacen("Change: ", "", 1)); } } - return Change { - author: commit.author().email().unwrap_or("").to_string(), - id: None, - commit: sha, - }; + return change; } #[tracing::instrument(skip(transaction))] diff --git a/tests/proxy/push_stacked.t b/tests/proxy/push_stacked.t index 7bcc2e656..96cad7921 100644 --- a/tests/proxy/push_stacked.t +++ b/tests/proxy/push_stacked.t @@ -21,13 +21,13 @@ $ echo contents2 > file2 $ git add file2 - $ git commit -m "Change-Id: 1234" 1> /dev/null + $ git commit -m "Change: 1234" 1> /dev/null $ echo contents2 > file7 $ git add file7 - $ git commit -m "Change-Id: foo7" 1> /dev/null + $ git commit -m "Change: foo7" 1> /dev/null $ git log --decorate --graph --pretty="%s %d" - * Change-Id: foo7 (HEAD -> master) - * Change-Id: 1234 + * Change: foo7 (HEAD -> master) + * Change: 1234 * add file1 (origin/master, origin/HEAD) $ git push -o author=foo@example.com origin master:refs/stack/for/master remote: josh-proxy @@ -57,7 +57,7 @@ $ git push -o author=josh@example.com origin master:refs/stack/for/master remote: josh-proxy remote: response from upstream: - remote: rejecting to push 3ad32b3bd3bb778441e7eae43930d8dc6293eddc without Change-Id + remote: rejecting to push 23c67dccc160a868cefdab0bd9d7141b7276c4f3 without label remote: remote: remote: error: hook declined to update refs/stack/for/master @@ -69,7 +69,7 @@ remote: josh-proxy remote: response from upstream: remote: To http://localhost:8001/real_repo.git - remote: ec41aad..3ad32b3 master -> @heads/master/foo@example.com + remote: 4903654..23c67dc master -> @heads/master/foo@example.com remote: remote: To http://localhost:8002/real_repo.git @@ -86,8 +86,8 @@ $ git log --decorate --graph --pretty="%s %d" * add file3 (HEAD -> master, origin/@heads/master/foo@example.com) - * Change-Id: foo7 (origin/@heads/master/josh@example.com, origin/@changes/master/josh@example.com/foo7) - * Change-Id: 1234 (origin/@changes/master/josh@example.com/1234) + * Change: foo7 (origin/@heads/master/josh@example.com, origin/@changes/master/josh@example.com/foo7) + * Change: 1234 (origin/@changes/master/josh@example.com/1234) * add file1 (origin/master, origin/HEAD) $ cd ${TESTTMP}/real_repo @@ -116,10 +116,10 @@ get listed if they differ from HEAD $ git ls-remote http://localhost:8002/real_repo.git 4950fa502f51b7bfda0d7975dbff9b0f9a9481ca\tHEAD (esc) - 3b0e3dbefd779ec54d92286047f32d3129161c0d\trefs/heads/@changes/master/josh@example.com/1234 (esc) - ec41aad70b4b898baf48efeb795a7753d9674152\trefs/heads/@changes/master/josh@example.com/foo7 (esc) - 3ad32b3bd3bb778441e7eae43930d8dc6293eddc\trefs/heads/@heads/master/foo@example.com (esc) - ec41aad70b4b898baf48efeb795a7753d9674152\trefs/heads/@heads/master/josh@example.com (esc) + 82599da2054669a020103a7bd8aa456540a0c5ee\trefs/heads/@changes/master/josh@example.com/1234 (esc) + 4903654ec80c5cff86ab37a0b9d7bcf8332e8c54\trefs/heads/@changes/master/josh@example.com/foo7 (esc) + 23c67dccc160a868cefdab0bd9d7141b7276c4f3\trefs/heads/@heads/master/foo@example.com (esc) + 4903654ec80c5cff86ab37a0b9d7bcf8332e8c54\trefs/heads/@heads/master/josh@example.com (esc) 4950fa502f51b7bfda0d7975dbff9b0f9a9481ca\trefs/heads/master (esc) $ git ls-remote http://localhost:8002/real_repo.git:/sub1.git @@ -128,9 +128,9 @@ get listed if they differ from HEAD $ git ls-remote http://localhost:8002/real_repo.git::file2.git $ git ls-remote http://localhost:8002/real_repo.git::file7.git 23b2396b6521abcd906f16d8492c5aeacaee06ed\tHEAD (esc) - 08c82a20e92d548ff32f86d634b82da6756e1f5f\trefs/heads/@changes/master/josh@example.com/foo7 (esc) - 08c82a20e92d548ff32f86d634b82da6756e1f5f\trefs/heads/@heads/master/foo@example.com (esc) - 08c82a20e92d548ff32f86d634b82da6756e1f5f\trefs/heads/@heads/master/josh@example.com (esc) + 57a39cc050b1493cf6313822f0de3cee3ca4f39a\trefs/heads/@changes/master/josh@example.com/foo7 (esc) + 57a39cc050b1493cf6313822f0de3cee3ca4f39a\trefs/heads/@heads/master/foo@example.com (esc) + 57a39cc050b1493cf6313822f0de3cee3ca4f39a\trefs/heads/@heads/master/josh@example.com (esc) 23b2396b6521abcd906f16d8492c5aeacaee06ed\trefs/heads/master (esc) Make sure all temporary namespace got removed @@ -158,16 +158,17 @@ Make sure all temporary namespace got removed | |-- info | | `-- exclude | |-- objects - | | |-- 3a - | | | `-- d32b3bd3bb778441e7eae43930d8dc6293eddc - | | |-- 3b - | | | `-- 0e3dbefd779ec54d92286047f32d3129161c0d + | | |-- 23 + | | | `-- c67dccc160a868cefdab0bd9d7141b7276c4f3 | | |-- 3d | | | `-- 77ff51363c9825cc2a221fc0ba5a883a1a2c72 | | |-- 49 + | | | |-- 03654ec80c5cff86ab37a0b9d7bcf8332e8c54 | | | `-- 50fa502f51b7bfda0d7975dbff9b0f9a9481ca | | |-- 6b | | | `-- 46faacade805991bcaea19382c9d941828ce80 + | | |-- 82 + | | | `-- 599da2054669a020103a7bd8aa456540a0c5ee | | |-- 85 | | | `-- 90a3b0b3086ab857b91581c320e377dc9780ea | | |-- 90 @@ -178,8 +179,6 @@ Make sure all temporary namespace got removed | | | `-- 24003ee1acc6bf70318a46e7b6df651b9dc246 | | |-- b2 | | | `-- dd517c55420a48cb543e0195b4751bf514b941 - | | |-- ec - | | | `-- 41aad70b4b898baf48efeb795a7753d9674152 | | |-- ed | | | `-- b2a5b9c65fae1d20c1b1fb777d1ea025456faa | | |-- info @@ -210,22 +209,23 @@ Make sure all temporary namespace got removed |-- info | `-- exclude |-- objects - | |-- 08 - | | `-- c82a20e92d548ff32f86d634b82da6756e1f5f | |-- 0b | | `-- 4cf6c9efbbda1eada39fa9c1d21d2525b027bb | |-- 0f | | `-- 8d6bce4783eb0366cc72cb5f6fb7952c360d89 | |-- 23 - | | `-- b2396b6521abcd906f16d8492c5aeacaee06ed - | |-- 38 - | | `-- 25d17d9f46345e352ea6d1d0a89f2be16a1b2c - | |-- 3a - | | `-- d32b3bd3bb778441e7eae43930d8dc6293eddc - | |-- 3b - | | `-- 0e3dbefd779ec54d92286047f32d3129161c0d + | | |-- b2396b6521abcd906f16d8492c5aeacaee06ed + | | `-- c67dccc160a868cefdab0bd9d7141b7276c4f3 + | |-- 49 + | | `-- 03654ec80c5cff86ab37a0b9d7bcf8332e8c54 + | |-- 57 + | | `-- a39cc050b1493cf6313822f0de3cee3ca4f39a | |-- 6b | | `-- 46faacade805991bcaea19382c9d941828ce80 + | |-- 82 + | | `-- 599da2054669a020103a7bd8aa456540a0c5ee + | |-- 8f + | | `-- f5dfb4fb8ef665cf128d90b68f0ed2f612cafd | |-- 96 | | `-- 539577d449c8e5446b5339c20436a13ec51f41 | |-- 9a @@ -234,8 +234,6 @@ Make sure all temporary namespace got removed | | `-- a557394ce29f000108607abd97f19fed4d1b7c | |-- b2 | | `-- dd517c55420a48cb543e0195b4751bf514b941 - | |-- ec - | | `-- 41aad70b4b898baf48efeb795a7753d9674152 | |-- ed | | `-- b2a5b9c65fae1d20c1b1fb777d1ea025456faa | |-- info @@ -245,7 +243,7 @@ Make sure all temporary namespace got removed |-- namespaces `-- tags - 57 directories, 43 files + 55 directories, 43 files $ cat ${TESTTMP}/josh-proxy.out $ cat ${TESTTMP}/josh-proxy.out | grep REPO_UPDATE diff --git a/tests/proxy/push_stacked_split.t b/tests/proxy/push_stacked_split.t index fdd1fe082..9863f7a86 100644 --- a/tests/proxy/push_stacked_split.t +++ b/tests/proxy/push_stacked_split.t @@ -21,17 +21,17 @@ $ echo contents2 > file2 $ git add file2 - $ git commit -m "Change-Id: 1234" 1> /dev/null + $ git commit -m "Change: 1234" 1> /dev/null $ echo contents2 > file7 $ git add file7 - $ git commit -m "Change-Id: foo7" 1> /dev/null + $ git commit -m "Change: foo7" 1> /dev/null $ echo contents3 > file2 $ git add file2 - $ git commit -m "Change-Id: 1235" 1> /dev/null + $ git commit -m "Change: 1235" 1> /dev/null $ git log --decorate --graph --pretty="%s %d" - * Change-Id: 1235 (HEAD -> master) - * Change-Id: foo7 - * Change-Id: 1234 + * Change: 1235 (HEAD -> master) + * Change: foo7 + * Change: 1234 * add file1 (origin/master, origin/HEAD) $ git push -o split -o author=josh@example.com origin master:refs/split/for/master remote: josh-proxy @@ -59,12 +59,12 @@ * [new branch] @heads/master/josh@example.com -> origin/@heads/master/josh@example.com $ git log --all --decorate --graph --pretty="%s %d" - * Change-Id: 1235 (HEAD -> master, origin/@heads/master/josh@example.com) - * Change-Id: foo7 - | * Change-Id: 1235 (origin/@changes/master/josh@example.com/1235) + * Change: 1235 (HEAD -> master, origin/@heads/master/josh@example.com) + * Change: foo7 + | * Change: 1235 (origin/@changes/master/josh@example.com/1235) |/ - * Change-Id: 1234 (origin/@changes/master/josh@example.com/1234) - | * Change-Id: foo7 (origin/@changes/master/josh@example.com/foo7) + * Change: 1234 (origin/@changes/master/josh@example.com/1234) + | * Change: foo7 (origin/@changes/master/josh@example.com/foo7) |/ * add file1 (origin/master, origin/HEAD) @@ -89,22 +89,27 @@ Make sure all temporary namespace got removed | |-- info | | `-- exclude | |-- objects + | | |-- 0e + | | | `-- 7970a3dec1b5bbba1dce0450d7a7dfc56a9797 | | |-- 14 | | | `-- 20ebc1972205ad0fe84c31eec84a8a7a334882 | | |-- 1c | | | `-- b5d64cdb55e3db2a8d6f00d596572b4cfa9d5c - | | |-- 3b - | | | `-- 0e3dbefd779ec54d92286047f32d3129161c0d + | | |-- 36 + | | | `-- c2216dd9dc554e35d4ae37794eb72392ae2591 | | |-- 3d | | | `-- 77ff51363c9825cc2a221fc0ba5a883a1a2c72 | | |-- 49 + | | | |-- 03654ec80c5cff86ab37a0b9d7bcf8332e8c54 | | | `-- 50fa502f51b7bfda0d7975dbff9b0f9a9481ca | | |-- 6b | | | `-- 46faacade805991bcaea19382c9d941828ce80 | | |-- 72 | | | `-- 7902c81346e29c4f75e0913bd62d7b85d7033f - | | |-- 7e - | | | `-- 693682dba1d7af1cb1eca7c3dcc5128e3ec9c6 + | | |-- 80 + | | | `-- b41c2bfde183168405cb8707032a8150184f6f + | | |-- 82 + | | | `-- 599da2054669a020103a7bd8aa456540a0c5ee | | |-- 85 | | | `-- 90a3b0b3086ab857b91581c320e377dc9780ea | | |-- 8a @@ -115,14 +120,8 @@ Make sure all temporary namespace got removed | | | `-- 24003ee1acc6bf70318a46e7b6df651b9dc246 | | |-- b2 | | | `-- dd517c55420a48cb543e0195b4751bf514b941 - | | |-- b7 - | | | `-- 8fc0fe9f3bd35c8dc8aeff5189ebda0750e974 - | | |-- ec - | | | `-- 41aad70b4b898baf48efeb795a7753d9674152 | | |-- ed | | | `-- b2a5b9c65fae1d20c1b1fb777d1ea025456faa - | | |-- fd - | | | `-- b894f9431a237930c7a034f3ecc16dd686b19e | | |-- info | | `-- pack | `-- refs @@ -151,30 +150,30 @@ Make sure all temporary namespace got removed |-- info | `-- exclude |-- objects + | |-- 0e + | | `-- 7970a3dec1b5bbba1dce0450d7a7dfc56a9797 | |-- 14 | | `-- 20ebc1972205ad0fe84c31eec84a8a7a334882 | |-- 1c | | `-- b5d64cdb55e3db2a8d6f00d596572b4cfa9d5c - | |-- 3b - | | `-- 0e3dbefd779ec54d92286047f32d3129161c0d + | |-- 36 + | | `-- c2216dd9dc554e35d4ae37794eb72392ae2591 + | |-- 49 + | | `-- 03654ec80c5cff86ab37a0b9d7bcf8332e8c54 | |-- 6b | | `-- 46faacade805991bcaea19382c9d941828ce80 | |-- 72 | | `-- 7902c81346e29c4f75e0913bd62d7b85d7033f - | |-- 7e - | | `-- 693682dba1d7af1cb1eca7c3dcc5128e3ec9c6 + | |-- 80 + | | `-- b41c2bfde183168405cb8707032a8150184f6f + | |-- 82 + | | `-- 599da2054669a020103a7bd8aa456540a0c5ee | |-- 8a | | `-- 778416d88308bf017cf54f0247e4780765361f | |-- b2 | | `-- dd517c55420a48cb543e0195b4751bf514b941 - | |-- b7 - | | `-- 8fc0fe9f3bd35c8dc8aeff5189ebda0750e974 - | |-- ec - | | `-- 41aad70b4b898baf48efeb795a7753d9674152 | |-- ed | | `-- b2a5b9c65fae1d20c1b1fb777d1ea025456faa - | |-- fd - | | `-- b894f9431a237930c7a034f3ecc16dd686b19e | |-- info | `-- pack `-- refs @@ -182,7 +181,7 @@ Make sure all temporary namespace got removed |-- namespaces `-- tags - 60 directories, 46 files + 59 directories, 46 files $ cat ${TESTTMP}/josh-proxy.out $ cat ${TESTTMP}/josh-proxy.out | grep REPO_UPDATE diff --git a/tests/proxy/push_stacked_sub.t b/tests/proxy/push_stacked_sub.t index 40821b93e..9bebe444f 100644 --- a/tests/proxy/push_stacked_sub.t +++ b/tests/proxy/push_stacked_sub.t @@ -20,13 +20,13 @@ $ echo contents2 > file2 $ git add file2 - $ git commit -m "Change-Id: 1234" 1> /dev/null + $ git commit -m "Change: 1234" 1> /dev/null $ echo contents2 > file7 $ git add file7 - $ git commit -m "Change-Id: foo7" 1> /dev/null + $ git commit -m "Change: foo7" 1> /dev/null $ git log --decorate --graph --pretty="%s %d" - * Change-Id: foo7 (HEAD -> master) - * Change-Id: 1234 + * Change: foo7 (HEAD -> master) + * Change: 1234 * add file1 (origin/master, origin/HEAD) $ git push -o author=josh@example.com origin master:refs/stack/for/master remote: josh-proxy @@ -74,7 +74,7 @@ $ git push -o author=josh@example.com origin master:refs/stack/for/master remote: josh-proxy remote: response from upstream: - remote: rejecting to push a3065162ecee0fecc977ec04a275e10b5e15a39c without Change-Id + remote: rejecting to push b24ca49011fe415d9668f7feb40cd3deb5c20a61 without label remote: remote: remote: error: hook declined to update refs/stack/for/master @@ -95,8 +95,8 @@ * [new branch] @heads/other_branch/josh@example.com -> origin/@heads/other_branch/josh@example.com $ git log --decorate --graph --pretty="%s %d" * add file3 (HEAD -> master) - * Change-Id: foo7 (origin/@heads/other_branch/josh@example.com, origin/@heads/master/josh@example.com, origin/@changes/other_branch/josh@example.com/foo7, origin/@changes/master/josh@example.com/foo7) - * Change-Id: 1234 (origin/@changes/other_branch/josh@example.com/1234, origin/@changes/master/josh@example.com/1234) + * Change: foo7 (origin/@heads/other_branch/josh@example.com, origin/@heads/master/josh@example.com, origin/@changes/other_branch/josh@example.com/foo7, origin/@changes/master/josh@example.com/foo7) + * Change: 1234 (origin/@changes/other_branch/josh@example.com/1234, origin/@changes/master/josh@example.com/1234) * add file1 (origin/master, origin/HEAD) $ cd ${TESTTMP}/real_repo @@ -142,12 +142,11 @@ Make sure all temporary namespace got removed | |-- info | | `-- exclude | |-- objects - | | |-- 2b - | | | `-- b94719cad2e76eb5dbcae874a2b0e44521e802 | | |-- 3d | | | `-- 77ff51363c9825cc2a221fc0ba5a883a1a2c72 | | |-- 6b - | | | `-- 46faacade805991bcaea19382c9d941828ce80 + | | | |-- 46faacade805991bcaea19382c9d941828ce80 + | | | `-- cb941a811aa3b70b6794a44d28b926a466002a | | |-- a0 | | | `-- 24003ee1acc6bf70318a46e7b6df651b9dc246 | | |-- b2 @@ -161,8 +160,8 @@ Make sure all temporary namespace got removed | | | `-- 27a2e3a6bfbb7307f522ad94fdfc8c20b92967 | | |-- c8 | | | `-- 2fc150c43f13cc56c0e9caeba01b58ec612022 - | | |-- e3 - | | | `-- a269743538338b0d059eda2f72976ec29220a8 + | | |-- d1 + | | | `-- 030c2e0611fd64e11a6485143e48cd30b89829 | | |-- info | | `-- pack | `-- refs @@ -196,23 +195,19 @@ Make sure all temporary namespace got removed |-- info | `-- exclude |-- objects + | |-- 06 + | | `-- 30e5c5b53e8c621a498904cc4b851f481d8fac | |-- 0b | | `-- 4cf6c9efbbda1eada39fa9c1d21d2525b027bb - | |-- 11 - | | `-- 06a6f09b169109f5ebd17428219142c67e84b9 - | |-- 2b - | | `-- b94719cad2e76eb5dbcae874a2b0e44521e802 - | |-- 40 - | | `-- 3e13a101fd75090369ffc317afafcfb646c576 - | |-- 4b - | | `-- 5ffb79a1f3852443bd747a6b213bf1e4abe168 + | |-- 50 + | | `-- 71f95f7f5d8fde1629ba2fcf134008b56ddf8e | |-- 6b - | | `-- 46faacade805991bcaea19382c9d941828ce80 + | | |-- 46faacade805991bcaea19382c9d941828ce80 + | | `-- cb941a811aa3b70b6794a44d28b926a466002a | |-- 88 | | `-- 2b84c5d3241087bc41982a744b72b7a174c49e - | |-- a3 - | | `-- 065162ecee0fecc977ec04a275e10b5e15a39c | |-- b2 + | | |-- 4ca49011fe415d9668f7feb40cd3deb5c20a61 | | `-- ea883bc5df63565960a38cad7a57f73ac66eaa | |-- ba | | |-- 7e17233d9f79c96cb694959eb065302acd96a6 @@ -221,8 +216,10 @@ Make sure all temporary namespace got removed | | `-- 33ab805ad4ef7ddda5b51e4a78ec0fac6b699a | |-- c6 | | `-- 27a2e3a6bfbb7307f522ad94fdfc8c20b92967 - | |-- e3 - | | `-- a269743538338b0d059eda2f72976ec29220a8 + | |-- d1 + | | `-- 030c2e0611fd64e11a6485143e48cd30b89829 + | |-- ec + | | `-- eda0a03c409bb2944ee1755af4fedb7e5b60cf | |-- info | `-- pack `-- refs @@ -230,7 +227,7 @@ Make sure all temporary namespace got removed |-- namespaces `-- tags - 57 directories, 44 files + 54 directories, 44 files $ cat ${TESTTMP}/josh-proxy.out $ cat ${TESTTMP}/josh-proxy.out | grep REPO_UPDATE