diff options
| author | Vincent Ambo <mail@tazj.in> | 2022-01-18T09·02+0300 |
|---|---|---|
| committer | clbot <clbot@tvl.fyi> | 2022-01-18T09·56+0000 |
| commit | e0d00b962125ea5d0f5858bce62536bef8b6f7b3 (patch) | |
| tree | 9a63b7139114c577b64502143dfcbcc2608daa63 /third_party/josh/0001-replace-mentions-of-master-with-canon.patch | |
| parent | e5181a13eddf2a1712f6d5ac19256204aa0f826e (diff) | |
feat(3p/josh): Bump to latest master r/3626
Change-Id: I32104d1cdc6d9cd72543d66bbe2f146e8ac27f6d Reviewed-on: https://cl.tvl.fyi/c/depot/+/4988 Autosubmit: tazjin <tazjin@tvl.su> Tested-by: BuildkiteCI Reviewed-by: sterni <sternenseemann@systemli.org>
Diffstat (limited to 'third_party/josh/0001-replace-mentions-of-master-with-canon.patch')
| -rw-r--r-- | third_party/josh/0001-replace-mentions-of-master-with-canon.patch | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/third_party/josh/0001-replace-mentions-of-master-with-canon.patch b/third_party/josh/0001-replace-mentions-of-master-with-canon.patch deleted file mode 100644 index 6e9a8028f22a..000000000000 --- a/third_party/josh/0001-replace-mentions-of-master-with-canon.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 4245dbdcacc3a4d4801a50071ba84379be4e1d2e Mon Sep 17 00:00:00 2001 -From: Vincent Ambo <mail@tazj.in> -Date: Tue, 1 Jun 2021 23:27:30 +0200 -Subject: [PATCH] replace mentions of 'master' with 'canon' - -While there are areas of josh that hardcode `master`, we can override -this to make it work for the TVL use-case. ---- - josh-proxy/src/bin/josh-proxy.rs | 2 +- - src/housekeeping.rs | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/josh-proxy/src/bin/josh-proxy.rs b/josh-proxy/src/bin/josh-proxy.rs -index 6f15566..76f4a5d 100644 ---- a/josh-proxy/src/bin/josh-proxy.rs -+++ b/josh-proxy/src/bin/josh-proxy.rs -@@ -374,7 +374,7 @@ async fn call_service( - - let mut headref = parsed_url.headref.trim_start_matches("@").to_owned(); - if headref == "" { -- headref = "refs/heads/master".to_string(); -+ headref = "refs/heads/canon".to_string(); - } - - let remote_url = [ -diff --git a/src/housekeeping.rs b/src/housekeeping.rs -index 5d08f81..1d55bc4 100644 ---- a/src/housekeeping.rs -+++ b/src/housekeeping.rs -@@ -44,12 +44,12 @@ pub fn memorize_from_to( - ) -> Vec<(String, String)> { - let mut refs = vec![]; - let glob = format!( -- "refs/josh/upstream/{}/refs/heads/master", -+ "refs/josh/upstream/{}/refs/heads/canon", - &to_ns(upstream_repo) - ); - for refname in repo.references_glob(&glob).unwrap().names() { - let refname = refname.unwrap(); -- let to_ref = format!("refs/{}/heads/master", &namespace); -+ let to_ref = format!("refs/{}/heads/canon", &namespace); - - refs.push((refname.to_owned(), to_ref.clone())); - } --- -2.31.1 - |