Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
F
Front-End
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abdullh.alsoleman
Front-End
Commits
cfcb9887
Unverified
Commit
cfcb9887
authored
Nov 05, 2020
by
Dan Field
Committed by
GitHub
Nov 05, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Do not use --first-parent when determining version on master (#69726)
parent
496efca1
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
13 additions
and
15 deletions
+13
-15
version.dart
packages/flutter_tools/lib/src/version.dart
+1
-1
upgrade_test.dart
...ter_tools/test/commands.shard/permeable/upgrade_test.dart
+1
-1
flutter_command_runner_test.dart
...est/general.shard/runner/flutter_command_runner_test.dart
+1
-1
version_test.dart
packages/flutter_tools/test/general.shard/version_test.dart
+10
-10
downgrade_upgrade_integration_test.dart
...integration.shard/downgrade_upgrade_integration_test.dart
+0
-2
No files found.
packages/flutter_tools/lib/src/version.dart
View file @
cfcb9887
...
@@ -779,7 +779,7 @@ class GitTagVersion {
...
@@ -779,7 +779,7 @@ class GitTagVersion {
// recent tag and number of commits past.
// recent tag and number of commits past.
return
parse
(
return
parse
(
_runGit
(
_runGit
(
'git describe --match *.*.* --
first-parent --
long --tags'
,
'git describe --match *.*.* --long --tags'
,
processUtils
,
processUtils
,
workingDirectory
,
workingDirectory
,
)
)
...
...
packages/flutter_tools/test/commands.shard/permeable/upgrade_test.dart
View file @
cfcb9887
...
@@ -341,7 +341,7 @@ void main() {
...
@@ -341,7 +341,7 @@ void main() {
),
),
const
FakeCommand
(
const
FakeCommand
(
command:
<
String
>[
command:
<
String
>[
'git'
,
'describe'
,
'--match'
,
'*.*.*'
,
'--
first-parent'
,
'--
long'
,
'--tags'
,
'git'
,
'describe'
,
'--match'
,
'*.*.*'
,
'--long'
,
'--tags'
,
],
],
stdout:
'v1.12.16-19-gb45b676af'
,
stdout:
'v1.12.16-19-gb45b676af'
,
),
),
...
...
packages/flutter_tools/test/general.shard/runner/flutter_command_runner_test.dart
View file @
cfcb9887
...
@@ -140,7 +140,7 @@ void main() {
...
@@ -140,7 +140,7 @@ void main() {
workingDirectory:
Cache
.
flutterRoot
)).
thenReturn
(
result
);
workingDirectory:
Cache
.
flutterRoot
)).
thenReturn
(
result
);
when
(
processManager
.
runSync
(
'git tag --points-at HEAD'
.
split
(
' '
),
when
(
processManager
.
runSync
(
'git tag --points-at HEAD'
.
split
(
' '
),
workingDirectory:
Cache
.
flutterRoot
)).
thenReturn
(
result
);
workingDirectory:
Cache
.
flutterRoot
)).
thenReturn
(
result
);
when
(
processManager
.
runSync
(
'git describe --match *.*.* --
first-parent --
long --tags'
.
split
(
' '
),
when
(
processManager
.
runSync
(
'git describe --match *.*.* --long --tags'
.
split
(
' '
),
workingDirectory:
Cache
.
flutterRoot
)).
thenReturn
(
result
);
workingDirectory:
Cache
.
flutterRoot
)).
thenReturn
(
result
);
when
(
processManager
.
runSync
(
FlutterVersion
.
gitLog
(
'-n 1 --pretty=format:%ad --date=iso'
.
split
(
' '
)),
when
(
processManager
.
runSync
(
FlutterVersion
.
gitLog
(
'-n 1 --pretty=format:%ad --date=iso'
.
split
(
' '
)),
workingDirectory:
Cache
.
flutterRoot
)).
thenReturn
(
result
);
workingDirectory:
Cache
.
flutterRoot
)).
thenReturn
(
result
);
...
...
packages/flutter_tools/test/general.shard/version_test.dart
View file @
cfcb9887
...
@@ -81,7 +81,7 @@ void main() {
...
@@ -81,7 +81,7 @@ void main() {
));
));
processManager
.
addCommand
(
const
FakeCommand
(
processManager
.
addCommand
(
const
FakeCommand
(
command:
<
String
>[
'git'
,
'describe'
,
'--match'
,
'*.*.*'
,
'--
first-parent'
,
'--
long'
,
'--tags'
],
command:
<
String
>[
'git'
,
'describe'
,
'--match'
,
'*.*.*'
,
'--long'
,
'--tags'
],
stdout:
'0.1.2-3-1234abcd'
,
stdout:
'0.1.2-3-1234abcd'
,
));
));
...
@@ -563,7 +563,7 @@ void main() {
...
@@ -563,7 +563,7 @@ void main() {
stdout:
''
,
// no tag
stdout:
''
,
// no tag
),
),
const
FakeCommand
(
const
FakeCommand
(
command:
<
String
>[
'git'
,
'describe'
,
'--match'
,
'*.*.*'
,
'--
first-parent'
,
'--
long'
,
'--tags'
],
command:
<
String
>[
'git'
,
'describe'
,
'--match'
,
'*.*.*'
,
'--long'
,
'--tags'
],
stdout:
'
$devTag
-
$commitsAhead
-g
$headRevision
'
,
stdout:
'
$devTag
-
$commitsAhead
-g
$headRevision
'
,
),
),
],
],
...
@@ -585,7 +585,7 @@ void main() {
...
@@ -585,7 +585,7 @@ void main() {
environment:
anyNamed
(
'environment'
),
environment:
anyNamed
(
'environment'
),
)).
thenReturn
(
RunResult
(
ProcessResult
(
105
,
0
,
''
,
''
),
<
String
>[
'git'
,
'fetch'
]));
)).
thenReturn
(
RunResult
(
ProcessResult
(
105
,
0
,
''
,
''
),
<
String
>[
'git'
,
'fetch'
]));
when
(
processUtils
.
runSync
(
when
(
processUtils
.
runSync
(
<
String
>[
'git'
,
'describe'
,
'--match'
,
'*.*.*'
,
'--
first-parent'
,
'--
long'
,
'--tags'
],
<
String
>[
'git'
,
'describe'
,
'--match'
,
'*.*.*'
,
'--long'
,
'--tags'
],
workingDirectory:
anyNamed
(
'workingDirectory'
),
workingDirectory:
anyNamed
(
'workingDirectory'
),
environment:
anyNamed
(
'environment'
),
environment:
anyNamed
(
'environment'
),
)).
thenReturn
(
RunResult
(
ProcessResult
(
106
,
0
,
'v0.1.2-3-1234abcd'
,
''
),
<
String
>[
'git'
,
'describe'
]));
)).
thenReturn
(
RunResult
(
ProcessResult
(
106
,
0
,
'v0.1.2-3-1234abcd'
,
''
),
<
String
>[
'git'
,
'describe'
]));
...
@@ -611,7 +611,7 @@ void main() {
...
@@ -611,7 +611,7 @@ void main() {
environment:
anyNamed
(
'environment'
),
environment:
anyNamed
(
'environment'
),
));
));
verify
(
processUtils
.
runSync
(
verify
(
processUtils
.
runSync
(
<
String
>[
'git'
,
'describe'
,
'--match'
,
'*.*.*'
,
'--
first-parent'
,
'--
long'
,
'--tags'
],
<
String
>[
'git'
,
'describe'
,
'--match'
,
'*.*.*'
,
'--long'
,
'--tags'
],
workingDirectory:
anyNamed
(
'workingDirectory'
),
workingDirectory:
anyNamed
(
'workingDirectory'
),
environment:
anyNamed
(
'environment'
),
environment:
anyNamed
(
'environment'
),
)).
called
(
1
);
)).
called
(
1
);
...
@@ -630,7 +630,7 @@ void main() {
...
@@ -630,7 +630,7 @@ void main() {
environment:
anyNamed
(
'environment'
),
environment:
anyNamed
(
'environment'
),
)).
thenReturn
(
RunResult
(
ProcessResult
(
106
,
0
,
''
,
''
),
<
String
>[
'git'
,
'fetch'
]));
)).
thenReturn
(
RunResult
(
ProcessResult
(
106
,
0
,
''
,
''
),
<
String
>[
'git'
,
'fetch'
]));
when
(
processUtils
.
runSync
(
when
(
processUtils
.
runSync
(
<
String
>[
'git'
,
'describe'
,
'--match'
,
'*.*.*'
,
'--
first-parent'
,
'--
long'
,
'--tags'
],
<
String
>[
'git'
,
'describe'
,
'--match'
,
'*.*.*'
,
'--long'
,
'--tags'
],
workingDirectory:
anyNamed
(
'workingDirectory'
),
workingDirectory:
anyNamed
(
'workingDirectory'
),
environment:
anyNamed
(
'environment'
),
environment:
anyNamed
(
'environment'
),
)).
thenReturn
(
RunResult
(
ProcessResult
(
107
,
0
,
'v0.1.2-3-1234abcd'
,
''
),
<
String
>[
'git'
,
'describe'
]));
)).
thenReturn
(
RunResult
(
ProcessResult
(
107
,
0
,
'v0.1.2-3-1234abcd'
,
''
),
<
String
>[
'git'
,
'describe'
]));
...
@@ -656,7 +656,7 @@ void main() {
...
@@ -656,7 +656,7 @@ void main() {
environment:
anyNamed
(
'environment'
),
environment:
anyNamed
(
'environment'
),
));
));
verify
(
processUtils
.
runSync
(
verify
(
processUtils
.
runSync
(
<
String
>[
'git'
,
'describe'
,
'--match'
,
'*.*.*'
,
'--
first-parent'
,
'--
long'
,
'--tags'
],
<
String
>[
'git'
,
'describe'
,
'--match'
,
'*.*.*'
,
'--long'
,
'--tags'
],
workingDirectory:
anyNamed
(
'workingDirectory'
),
workingDirectory:
anyNamed
(
'workingDirectory'
),
environment:
anyNamed
(
'environment'
),
environment:
anyNamed
(
'environment'
),
)).
called
(
1
);
)).
called
(
1
);
...
@@ -683,7 +683,7 @@ void main() {
...
@@ -683,7 +683,7 @@ void main() {
<
String
>[
'git'
,
'tag'
,
'--points-at'
,
'HEAD'
],
<
String
>[
'git'
,
'tag'
,
'--points-at'
,
'HEAD'
],
));
));
when
(
processUtils
.
runSync
(
when
(
processUtils
.
runSync
(
<
String
>[
'git'
,
'describe'
,
'--match'
,
'*.*.*'
,
'--
first-parent'
,
'--
long'
,
'--tags'
],
<
String
>[
'git'
,
'describe'
,
'--match'
,
'*.*.*'
,
'--long'
,
'--tags'
],
workingDirectory:
anyNamed
(
'workingDirectory'
),
workingDirectory:
anyNamed
(
'workingDirectory'
),
environment:
anyNamed
(
'environment'
),
environment:
anyNamed
(
'environment'
),
)).
thenReturn
(
RunResult
(
ProcessResult
(
111
,
0
,
'v0.1.2-3-1234abcd'
,
''
),
<
String
>[
'git'
,
'describe'
]));
)).
thenReturn
(
RunResult
(
ProcessResult
(
111
,
0
,
'v0.1.2-3-1234abcd'
,
''
),
<
String
>[
'git'
,
'describe'
]));
...
@@ -701,7 +701,7 @@ void main() {
...
@@ -701,7 +701,7 @@ void main() {
environment:
anyNamed
(
'environment'
),
environment:
anyNamed
(
'environment'
),
)).
called
(
1
);
)).
called
(
1
);
verify
(
processUtils
.
runSync
(
verify
(
processUtils
.
runSync
(
<
String
>[
'git'
,
'describe'
,
'--match'
,
'*.*.*'
,
'--
first-parent'
,
'--
long'
,
'--tags'
],
<
String
>[
'git'
,
'describe'
,
'--match'
,
'*.*.*'
,
'--long'
,
'--tags'
],
workingDirectory:
anyNamed
(
'workingDirectory'
),
workingDirectory:
anyNamed
(
'workingDirectory'
),
environment:
anyNamed
(
'environment'
),
environment:
anyNamed
(
'environment'
),
)).
called
(
1
);
)).
called
(
1
);
...
@@ -728,7 +728,7 @@ void main() {
...
@@ -728,7 +728,7 @@ void main() {
<
String
>[
'git'
,
'tag'
,
'--points-at'
,
'HEAD'
],
<
String
>[
'git'
,
'tag'
,
'--points-at'
,
'HEAD'
],
));
));
when
(
processUtils
.
runSync
(
when
(
processUtils
.
runSync
(
<
String
>[
'git'
,
'describe'
,
'--match'
,
'*.*.*'
,
'--
first-parent'
,
'--
long'
,
'--tags'
],
<
String
>[
'git'
,
'describe'
,
'--match'
,
'*.*.*'
,
'--long'
,
'--tags'
],
workingDirectory:
anyNamed
(
'workingDirectory'
),
workingDirectory:
anyNamed
(
'workingDirectory'
),
environment:
anyNamed
(
'environment'
),
environment:
anyNamed
(
'environment'
),
)).
thenReturn
(
RunResult
(
ProcessResult
(
111
,
0
,
'v0.1.2-3-1234abcd'
,
''
),
<
String
>[
'git'
,
'describe'
]));
)).
thenReturn
(
RunResult
(
ProcessResult
(
111
,
0
,
'v0.1.2-3-1234abcd'
,
''
),
<
String
>[
'git'
,
'describe'
]));
...
@@ -866,7 +866,7 @@ void fakeData(
...
@@ -866,7 +866,7 @@ void fakeData(
environment:
anyNamed
(
'environment'
),
environment:
anyNamed
(
'environment'
),
)).
thenReturn
(
ProcessResult
(
106
,
0
,
''
,
''
));
)).
thenReturn
(
ProcessResult
(
106
,
0
,
''
,
''
));
when
(
pm
.
runSync
(
when
(
pm
.
runSync
(
<
String
>[
'git'
,
'describe'
,
'--match'
,
'*.*.*'
,
'--
first-parent'
,
'--
long'
,
'--tags'
],
<
String
>[
'git'
,
'describe'
,
'--match'
,
'*.*.*'
,
'--long'
,
'--tags'
],
workingDirectory:
anyNamed
(
'workingDirectory'
),
workingDirectory:
anyNamed
(
'workingDirectory'
),
environment:
anyNamed
(
'environment'
),
environment:
anyNamed
(
'environment'
),
)).
thenReturn
(
ProcessResult
(
107
,
0
,
'v0.1.2-3-1234abcd'
,
''
));
)).
thenReturn
(
ProcessResult
(
107
,
0
,
'v0.1.2-3-1234abcd'
,
''
));
...
...
packages/flutter_tools/test/integration.shard/downgrade_upgrade_integration_test.dart
View file @
cfcb9887
...
@@ -99,7 +99,6 @@ void main() {
...
@@ -99,7 +99,6 @@ void main() {
'describe'
,
'describe'
,
'--match'
,
'--match'
,
'v*.*.*'
,
'v*.*.*'
,
'--first-parent'
,
'--long'
,
'--long'
,
'--tags'
,
'--tags'
,
],
workingDirectory:
testDirectory
.
path
);
],
workingDirectory:
testDirectory
.
path
);
...
@@ -123,7 +122,6 @@ void main() {
...
@@ -123,7 +122,6 @@ void main() {
'describe'
,
'describe'
,
'--match'
,
'--match'
,
'v*.*.*'
,
'v*.*.*'
,
'--first-parent'
,
'--long'
,
'--long'
,
'--tags'
,
'--tags'
,
],
workingDirectory:
testDirectory
.
path
);
],
workingDirectory:
testDirectory
.
path
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment