diff options
| author | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2020-09-21 13:55:26 +0300 |
|---|---|---|
| committer | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2020-09-21 13:55:26 +0300 |
| commit | 10ea329e1ff80495a0ccc964db42a05cda0f5a0f (patch) | |
| tree | 2d5a828ce7474ee10fc2b54f4294d1c0a75c3b4e | |
| parent | ae4a0c3ee3c9aadabb49f607425920ce38a53ec9 (diff) | |
| download | qtlocation-mapboxgl-upstream/tmpsantos-js_main.tar.gz | |
[build] s/master/main on GL JSupstream/tmpsantos-js_main
Check if pinned against main.
| -rwxr-xr-x | scripts/nitpick/submodule-pin.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/nitpick/submodule-pin.js b/scripts/nitpick/submodule-pin.js index 7ca129e096..72d8f673c6 100755 --- a/scripts/nitpick/submodule-pin.js +++ b/scripts/nitpick/submodule-pin.js @@ -6,8 +6,8 @@ const child_process = require('child_process'); const head = child_process.execSync('git -C mapbox-gl-js rev-parse HEAD').toString().trim(); const revs = child_process.execSync(`git -C mapbox-gl-js branch -a --contains ${head}`).toString().split('\n'); -if (revs.indexOf(' remotes/origin/master') >= 0) { - nitpick.ok(`mapbox-gl-js submodule pin is merged to master`); +if (revs.indexOf(' remotes/origin/main') >= 0) { + nitpick.ok(`mapbox-gl-js submodule pin is merged to main`); } else { - nitpick.fail(`mapbox-gl-js submodule is pinned to ${head}, which isn't merged to master`); + nitpick.fail(`mapbox-gl-js submodule is pinned to ${head}, which isn't merged to main`); } |