mirror of
https://github.com/espressif/openthread.git
synced 2026-06-05 21:14:49 +00:00
[git-tool] explicit disable rebase (#10645)
This commit adds `--no-rebase` to `git` command when applying dependencies because recent git versions doesn't have a default rebase strategy anymore.
This commit is contained in:
+1
-1
@@ -46,7 +46,7 @@ apply_dependencies()
|
||||
echo "${dependency}"
|
||||
depends_on_pr="$(echo "${dependency}" | tr -d '\r\n' | cut -d# -f2)"
|
||||
echo "pr: #${depends_on_pr}"
|
||||
git pull --no-edit origin "pull/${depends_on_pr}/merge"
|
||||
git pull --no-edit --no-rebase origin "pull/${depends_on_pr}/merge"
|
||||
done < <(grep -E "^Depends-On: *${project_name}" || true)
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user