espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-08-08 03:37:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

[git] fix non-fast-forward pull (#6253)

Browse Source
This commit is contained in:
Yakun Xu
2021-03-09 11:00:19 -08:00
committed by GitHub
parent e5614d8ecb
commit cf5c3d3666
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
script/git-tool
+5 -1
View File
@@ -38,11 +38,15 @@ apply_dependencies()
project_name=$(git remote get-url origin | grep -oE '[^/:]+/[^/:]+\.git$' | cut -d. -f1)
echo "project name: ${project_name}"
git config user.name || git config user.name 'OpenThread Git'
git config user.email || git config user.email 'git@openthread'
while read -r dependency; do
echo "${dependency}"
depends_on_pr="$(echo "${dependency}" | tr -d '\r\n' | cut -d# -f2)"
echo "pr: #${depends_on_pr}"
git pull origin "pull/${depends_on_pr}/merge"
git pull --no-edit origin "pull/${depends_on_pr}/merge"
done < <(grep -E "^Depends-On: *${project_name}" || true)
}