[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:
Yakun Xu
2024-08-28 10:58:17 +08:00
committed by GitHub
parent 95a4c338e0
commit 706013fa7b
+1 -1
View File
@@ -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)
}