fix restyle_merge.sh not work issue (#12262)

project-chip · May 25, 2022 · 3121784 · 3121784
1 parent 45e7537
commit 3121784
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/scripts/helpers/restyle_merge.sh b/scripts/helpers/restyle_merge.sh
@@ -16,9 +16,10 @@
 # limitations under the License.
 #
 set -x
-env
+
+branch_name=$(git branch | grep "^*" | awk '{print $2}')
 
 git remote add upstream https://github.com/project-chip/connectedhomeip.git
-git fetch upstream pull/"$1"/head
+git fetch upstream restyled/"$branch_name"
 git merge --ff-only FETCH_HEAD
 git push