From 706013fa7b71017f5916fc134be6309f3495ff7f Mon Sep 17 00:00:00 2001 From: Yakun Xu Date: Wed, 28 Aug 2024 10:58:17 +0800 Subject: [PATCH] [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. --- script/git-tool | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/git-tool b/script/git-tool index c6fb695f07a..f0f057ee89d 100755 --- a/script/git-tool +++ b/script/git-tool @@ -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) }