Skip to content

Commit bd51c78

Browse files
authored
Fix the git log command in the toolchain update script (#4139)
The `git log` command used in the toolchain update script generated commits that are not between the current and next toolchain commits. This PR fixes the command through adding the `--ancestry-path` option: ``` --ancestry-path When given a range of commits to display (e.g. commit1..commit2 or commit2 ^commit1), only display commits that exist directly on the ancestry chain between the commit1 and commit2, i.e. commits that are both descendants of commit1, and ancestors of commit2. ``` Resolves #4128 By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 and MIT licenses.
1 parent 46e5967 commit bd51c78

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

scripts/toolchain_update.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ then
5050
EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64)
5151
echo "git_log<<$EOF" >> $GITHUB_ENV
5252

53-
git log --oneline $current_toolchain_hash..$next_toolchain_hash | \
53+
git log --oneline --ancestry-path $current_toolchain_hash..$next_toolchain_hash | \
5454
sed 's#^#https://github.com/rust-lang/rust/commit/#' >> $GITHUB_ENV
5555
echo "$EOF" >> $GITHUB_ENV
5656

0 commit comments

Comments
 (0)