Skip to content

Commit 55269c5

Browse files
authored
last_engine_commit.ps1: Use $flutterRoot instead of $gitTopLevel (flutter#172786)
Closes flutter#172190.
1 parent ca7c95c commit 55269c5

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

bin/internal/last_engine_commit.ps1

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,8 @@ $ErrorActionPreference = "Stop" # Equivalent to 'set -e' in bash
2424

2525
$progName = Split-Path -parent $MyInvocation.MyCommand.Definition
2626
$flutterRoot = (Get-Item $progName).parent.parent.FullName
27-
$gitToplevel = (git rev-parse --show-toplevel).Trim()
2827

29-
$Path1 = Join-Path $gitToplevel "bin"
28+
$Path1 = Join-Path $flutterRoot "bin"
3029
$Path2 = Join-Path $Path1 "internal"
3130
$RELEASE_CANDIDATE_VERSION_PATH = Join-Path $Path2 "release-candidate-branch.version"
3231

@@ -53,8 +52,8 @@ if ([string]::IsNullOrEmpty($REFERENCE_COMMIT)) {
5352
# but not from the REFERENCE_COMMIT. This focuses the search on commits
5453
# *unique to the current branch* since that file was last changed.
5554
$HISTORY_RANGE = "$REFERENCE_COMMIT..HEAD"
56-
$DEPS_PATH = Join-Path $gitToplevel "DEPS"
57-
$ENGINE_PATH = Join-Path $gitToplevel "engine"
55+
$DEPS_PATH = Join-Path $flutterRoot "DEPS"
56+
$ENGINE_PATH = Join-Path $flutterRoot "engine"
5857

5958
$ENGINE_COMMIT = (git log -1 --pretty=format:%H --ancestry-path $HISTORY_RANGE -- "$DEPS_PATH" "$ENGINE_PATH")
6059

0 commit comments

Comments
 (0)