mirror of
https://github.com/scratchfoundation/paper.js.git
synced 2025-08-28 22:08:54 -04:00
Merge commit '7bb34e4
' into merge-latest-paper
This commit is contained in:
commit
c3c51d29f6
147 changed files with 4962 additions and 1100 deletions
|
@ -2,8 +2,8 @@
|
|||
* Paper.js - The Swiss Army Knife of Vector Graphics Scripting.
|
||||
* http://paperjs.org/
|
||||
*
|
||||
* Copyright (c) 2011 - 2016, Juerg Lehni & Jonathan Puckey
|
||||
* http://scratchdisk.com/ & http://jonathanpuckey.com/
|
||||
* Copyright (c) 2011 - 2020, Jürg Lehni & Jonathan Puckey
|
||||
* http://juerglehni.com/ & https://puckey.studio/
|
||||
*
|
||||
* Distributed under the MIT license. See LICENSE file for details.
|
||||
*
|
||||
|
@ -24,9 +24,10 @@ options.date = git('log -1 --pretty=format:%ad');
|
|||
options.branch = git('rev-parse --abbrev-ref HEAD');
|
||||
|
||||
// If a specific branch is requested, quit without errors if we don't match.
|
||||
if (argv.branch && argv.branch !== options.branch) {
|
||||
console.log('Branch "' + options.branch + '" does not match "' +
|
||||
argv.branch + '". There is nothing to do here.');
|
||||
var ensureBranch = argv['ensure-branch'];
|
||||
if (ensureBranch && ensureBranch !== options.branch) {
|
||||
console.log('Branch "' + options.branch + '" does not match requested "' +
|
||||
ensureBranch + '". There is nothing to do here.');
|
||||
process.exit(0);
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue