Merge PR ceph#61149 into main

batrick · batrick · commit 2c0b63ce0be9 · 2024-12-20T11:05:57.000-05:00
* refs/pull/61149/head:
	script/ceph-backport: allow hyphen in project during ceph fork deduction

Reviewed-by: Patrick Donnelly &lt;pdonnell@ibm.com&gt;
diff --git a/src/script/ceph-backport.sh b/src/script/ceph-backport.sh
@@ -779,7 +779,7 @@ function maybe_deduce_remote {
     else
         assert_fail "bad remote_type ->$remote_type<- in maybe_deduce_remote"
     fi
-    remote=$(git remote -v | grep --extended-regexp --ignore-case '(://|@)github.com(/|:|:/)'${url_component}'/ceph(\s|\.|\/)' | head -n1 | cut -f 1)
+    remote=$(git remote -v | grep --extended-regexp --ignore-case '(://|@)github.com(/|:|:/)'${url_component}'/ceph(\s|\.|\/|-)' | head -n1 | cut -f 1)
     echo "$remote"
 }
 

Original file line number	Diff line number	Diff line change
`@@ -779,7 +779,7 @@ function maybe_deduce_remote {`
`779`	`779`	`else`
`780`	`780`	`assert_fail "bad remote_type ->$remote_type<- in maybe_deduce_remote"`
`781`	`781`	`fi`
`782`		`- remote=$(git remote -v \| grep --extended-regexp --ignore-case '(://\|@)github.com(/\|:\|:/)'${url_component}'/ceph(\s\|\.\|\/)' \| head -n1 \| cut -f 1)`
	`782`	`+ remote=$(git remote -v \| grep --extended-regexp --ignore-case '(://\|@)github.com(/\|:\|:/)'${url_component}'/ceph(\s\|\.\|\/\|-)' \| head -n1 \| cut -f 1)`
`783`	`783`	`echo "$remote"`
`784`	`784`	`}`
`785`	`785`