jsii-release 0.2.124 → 0.2.125
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/help/git.js +12 -4
- package/package.json +1 -1
package/lib/help/git.js
CHANGED
|
@@ -91,11 +91,19 @@ exports.push = push;
|
|
|
91
91
|
* @param options options.
|
|
92
92
|
*/
|
|
93
93
|
function checkout(branch, options) {
|
|
94
|
-
const flags = [];
|
|
95
94
|
if (options.createIfMissing) {
|
|
96
|
-
|
|
95
|
+
try {
|
|
96
|
+
shell.run(`git show-branch origin/${branch}`);
|
|
97
|
+
}
|
|
98
|
+
catch (e) {
|
|
99
|
+
if (e instanceof Error && e.message.includes('fatal: bad sha1 reference')) {
|
|
100
|
+
console.log('Remote branch not found, creating new branch.');
|
|
101
|
+
shell.run(`git checkout -B ${branch}`);
|
|
102
|
+
return;
|
|
103
|
+
}
|
|
104
|
+
}
|
|
97
105
|
}
|
|
98
|
-
shell.run(`git checkout
|
|
106
|
+
shell.run(`git checkout ${branch}`);
|
|
99
107
|
}
|
|
100
108
|
exports.checkout = checkout;
|
|
101
109
|
/**
|
|
@@ -137,4 +145,4 @@ function identify(user, address) {
|
|
|
137
145
|
shell.run(`git config user.email "${address}"`);
|
|
138
146
|
}
|
|
139
147
|
exports.identify = identify;
|
|
140
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
148
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2l0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2hlbHAvZ2l0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLGlDQUFpQztBQUVqQzs7Ozs7R0FLRztBQUNILFNBQWdCLEtBQUssQ0FBQyxhQUFxQixFQUFFLFNBQWlCO0lBQzVELE1BQU0sV0FBVyxHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUMsWUFBWSxDQUFDO0lBQzdDLElBQUksQ0FBQyxXQUFXLEVBQUU7UUFDaEIsTUFBTSxJQUFJLEtBQUssQ0FBQyx1Q0FBdUMsQ0FBQyxDQUFDO0tBQzFEO0lBQ0QsS0FBSyxDQUFDLEdBQUcsQ0FBQyxxQkFBcUIsV0FBVyxJQUFJLGFBQWEsUUFBUSxTQUFTLEVBQUUsQ0FBQyxDQUFDO0FBQ2xGLENBQUM7QUFORCxzQkFNQztBQUVEOzs7O0dBSUc7QUFDSCxTQUFnQixTQUFTO0lBQ3ZCLElBQUk7UUFDRixLQUFLLENBQUMsR0FBRyxDQUFDLG9DQUFvQyxDQUFDLENBQUM7UUFDaEQsT0FBTyxLQUFLLENBQUM7S0FDZDtJQUFDLE9BQU8sR0FBRyxFQUFFO1FBQ1osT0FBTyxJQUFJLENBQUM7S0FDYjtBQUNILENBQUM7QUFQRCw4QkFPQztBQUVEOzs7O0dBSUc7QUFDSCxTQUFnQixHQUFHLENBQUMsQ0FBUztJQUMzQixLQUFLLENBQUMsR0FBRyxDQUFDLFdBQVcsQ0FBQyxFQUFFLENBQUMsQ0FBQztBQUM1QixDQUFDO0FBRkQsa0JBRUM7QUFFRDs7OztHQUlHO0FBQ0gsU0FBZ0IsTUFBTSxDQUFDLE9BQWU7SUFDcEMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxrQkFBa0IsT0FBTyxHQUFHLENBQUMsQ0FBQztBQUMxQyxDQUFDO0FBRkQsd0JBRUM7QUFFRDs7R0FFRztBQUNILFNBQWdCLElBQUk7SUFDbEIsS0FBSyxDQUFDLEdBQUcsQ0FBQyxVQUFVLENBQUMsQ0FBQztBQUN4QixDQUFDO0FBRkQsb0JBRUM7QUFFRDs7Ozs7R0FLRztBQUNILFNBQWdCLEdBQUcsQ0FBQyxJQUFZO0lBQzlCLElBQUk7UUFDRixLQUFLLENBQUMsR0FBRyxDQUFDLGNBQWMsSUFBSSxPQUFPLElBQUksRUFBRSxFQUFFLEVBQUUsT0FBTyxFQUFFLElBQUksRUFBRSxDQUFDLENBQUM7UUFDOUQsT0FBTyxJQUFJLENBQUM7S0FDYjtJQUFDLE9BQU8sQ0FBQyxFQUFFO1FBQ1YsSUFBSSxDQUFDLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxnQkFBZ0IsQ0FBQyxFQUFFO1lBQ3hDLE9BQU8sS0FBSyxDQUFDO1NBQ2Q7UUFDRCxNQUFNLENBQUMsQ0FBQztLQUNUO0FBQ0gsQ0FBQztBQVZELGtCQVVDO0FBRUQ7Ozs7R0FJRztBQUNILFNBQWdCLElBQUksQ0FBQyxHQUFXO0lBQzlCLEtBQUssQ0FBQyxHQUFHLENBQUMsbUJBQW1CLEdBQUcsRUFBRSxDQUFDLENBQUM7QUFDdEMsQ0FBQztBQUZELG9CQUVDO0FBRUQ7Ozs7O0dBS0c7QUFDSCxTQUFnQixRQUFRLENBQUMsTUFBYyxFQUFFLE9BQXNDO0lBQzdFLElBQUksT0FBTyxDQUFDLGVBQWUsRUFBRTtRQUMzQixJQUFJO1lBQ0YsS0FBSyxDQUFDLEdBQUcsQ0FBQywwQkFBMEIsTUFBTSxFQUFFLENBQUMsQ0FBQztTQUMvQztRQUFDLE9BQU8sQ0FBQyxFQUFFO1lBQ1YsSUFBSSxDQUFDLFlBQVksS0FBSyxJQUFJLENBQUMsQ0FBQyxPQUFPLENBQUMsUUFBUSxDQUFDLDJCQUEyQixDQUFDLEVBQUU7Z0JBQ3pFLE9BQU8sQ0FBQyxHQUFHLENBQUMsK0NBQStDLENBQUMsQ0FBQztnQkFDN0QsS0FBSyxDQUFDLEdBQUcsQ0FBQyxtQkFBbUIsTUFBTSxFQUFFLENBQUMsQ0FBQztnQkFDdkMsT0FBTzthQUNSO1NBQ0Y7S0FDRjtJQUNELEtBQUssQ0FBQyxHQUFHLENBQUMsZ0JBQWdCLE1BQU0sRUFBRSxDQUFDLENBQUM7QUFDdEMsQ0FBQztBQWJELDRCQWFDO0FBRUQ7OztHQUdHO0FBQ0gsU0FBZ0IsUUFBUTtJQUN0QixJQUFJO1FBQ0YsT0FBTyxLQUFLLENBQUMsR0FBRyxDQUFDLHNCQUFzQixFQUFFLEVBQUUsT0FBTyxFQUFFLElBQUksRUFBRSxDQUFDLENBQUM7S0FDN0Q7SUFBQyxPQUFPLEdBQUcsRUFBRTtRQUNaLE9BQU8sQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQzFCLE9BQU8sU0FBUyxDQUFDO0tBQ2xCO0FBQ0gsQ0FBQztBQVBELDRCQU9DO0FBRUQ7OztHQUdHO0FBQ0gsU0FBZ0IsS0FBSztJQUNuQixJQUFJO1FBQ0YsT0FBTyxLQUFLLENBQUMsR0FBRyxDQUFDLHVCQUF1QixFQUFFLEVBQUUsT0FBTyxFQUFFLElBQUksRUFBRSxDQUFDLENBQUM7S0FDOUQ7SUFBQyxPQUFPLEdBQUcsRUFBRTtRQUNaLE9BQU8sQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQzFCLE9BQU8sU0FBUyxDQUFDO0tBQ2xCO0FBQ0gsQ0FBQztBQVBELHNCQU9DO0FBRUQ7Ozs7O0dBS0c7QUFDSCxTQUFnQixRQUFRLENBQUMsSUFBWSxFQUFFLE9BQWU7SUFDcEQsS0FBSyxDQUFDLEdBQUcsQ0FBQyx5QkFBeUIsSUFBSSxHQUFHLENBQUMsQ0FBQztJQUM1QyxLQUFLLENBQUMsR0FBRyxDQUFDLDBCQUEwQixPQUFPLEdBQUcsQ0FBQyxDQUFDO0FBQ2xELENBQUM7QUFIRCw0QkFHQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCAqIGFzIHNoZWxsIGZyb20gJy4vc2hlbGwnO1xuXG4vKipcbiAqIENsb25lcyBhIHJlcG9zaXRvcnkgZnJvbSBHaXRIdWIuIFJlcXVpcmVzIGEgYEdJVEhVQl9UT0tFTmAgZW52IHZhcmlhYmxlLlxuICpcbiAqIEBwYXJhbSByZXBvc2l0b3J5VXJsIHRoZSByZXBvc2l0b3J5IHRvIGNsb25lLlxuICogQHBhcmFtIHRhcmdldERpciB0aGUgY2xvbmUgZGlyZWN0b3J5LlxuICovXG5leHBvcnQgZnVuY3Rpb24gY2xvbmUocmVwb3NpdG9yeVVybDogc3RyaW5nLCB0YXJnZXREaXI6IHN0cmluZykge1xuICBjb25zdCBnaXRIdWJUb2tlbiA9IHByb2Nlc3MuZW52LkdJVEhVQl9UT0tFTjtcbiAgaWYgKCFnaXRIdWJUb2tlbikge1xuICAgIHRocm93IG5ldyBFcnJvcignR0lUSFVCX1RPS0VOIGVudiB2YXJpYWJsZSBpcyByZXF1aXJlZCcpO1xuICB9XG4gIHNoZWxsLnJ1bihgZ2l0IGNsb25lIGh0dHBzOi8vJHtnaXRIdWJUb2tlbn1AJHtyZXBvc2l0b3J5VXJsfS5naXQgJHt0YXJnZXREaXJ9YCk7XG59XG5cbi8qKlxuICogUXVlcnkgdGhlIGdpdCBpbmRleCBmb3IgY2hhbmdlcy5cbiAqXG4gKiBAcmV0dXJuIFRydWUgaWYgY2hhbmdlcyBleGlzdCwgRmFsc2Ugb3RoZXJ3aXNlLlxuICovXG5leHBvcnQgZnVuY3Rpb24gZGlmZkluZGV4KCk6IGJvb2xlYW4ge1xuICB0cnkge1xuICAgIHNoZWxsLnJ1bignZ2l0IGRpZmYtaW5kZXggLS1leGl0LWNvZGUgSEVBRCAtLScpO1xuICAgIHJldHVybiBmYWxzZTtcbiAgfSBjYXRjaCAoZXJyKSB7XG4gICAgcmV0dXJuIHRydWU7XG4gIH1cbn1cblxuLyoqXG4gKiBBZGQgZmlsZXMgdG8gdGhlIGluZGV4LlxuICpcbiAqIEBwYXJhbSBwIHRoZSBwYXRoLlxuICovXG5leHBvcnQgZnVuY3Rpb24gYWRkKHA6IHN0cmluZykge1xuICBzaGVsbC5ydW4oYGdpdCBhZGQgJHtwfWApO1xufVxuXG4vKipcbiAqIENvbW1pdC5cbiAqXG4gKiBAcGFyYW0gbWVzc2FnZSB0aGUgY29tbWl0IG1lc3NhZ2UuXG4gKi9cbmV4cG9ydCBmdW5jdGlvbiBjb21taXQobWVzc2FnZTogc3RyaW5nKSB7XG4gIHNoZWxsLnJ1bihgZ2l0IGNvbW1pdCAtbSBcIiR7bWVzc2FnZX1cImApO1xufVxuXG4vKipcbiAqIEluaXRpYWxpemUgYSByZXBvc2l0b3J5LlxuICovXG5leHBvcnQgZnVuY3Rpb24gaW5pdCgpIHtcbiAgc2hlbGwucnVuKCdnaXQgaW5pdCcpO1xufVxuXG4vKipcbiAqIENlcmF0ZSBhIHRhZy5cbiAqXG4gKiBAcGFyYW0gbmFtZSB0YWcgbmFtZS5cbiAqIEByZXR1cm5zIHRydWUgaWYgdGhlIHRhZyB3YXMgY3JlYXRlZCwgZmFsc2UgaWYgaXQgYWxyZWFkeSBleGlzdHMuXG4gKi9cbmV4cG9ydCBmdW5jdGlvbiB0YWcobmFtZTogc3RyaW5nKTogYm9vbGVhbiB7XG4gIHRyeSB7XG4gICAgc2hlbGwucnVuKGBnaXQgdGFnIC1hICR7bmFtZX0gLW0gJHtuYW1lfWAsIHsgY2FwdHVyZTogdHJ1ZSB9KTtcbiAgICByZXR1cm4gdHJ1ZTtcbiAgfSBjYXRjaCAoZSkge1xuICAgIGlmIChlLm1lc3NhZ2UuaW5jbHVkZXMoJ2FscmVhZHkgZXhpc3RzJykpIHtcbiAgICAgIHJldHVybiBmYWxzZTtcbiAgICB9XG4gICAgdGhyb3cgZTtcbiAgfVxufVxuXG4vKipcbiAqIFB1c2ggYSByZWYgdG8gb3JpZ2luLlxuICpcbiAqIEBwYXJhbSByZWYgdGhlIHJlZlxuICovXG5leHBvcnQgZnVuY3Rpb24gcHVzaChyZWY6IHN0cmluZykge1xuICBzaGVsbC5ydW4oYGdpdCBwdXNoIG9yaWdpbiAke3JlZn1gKTtcbn1cblxuLyoqXG4gKiBDaGVja291dCB0byBhIG5ldyBicmFuY2guIENyZWF0ZXMgYSBuZXcgb25lIGlmIGBvcHRpb25zLmNyZWF0ZUlmTWlzc2luZ2AgaXMgVHJ1ZSBhbmQgdGhlIGJyYW5jaCBkb2Vzbid0IGV4aXN0LlxuICpcbiAqIEBwYXJhbSBicmFuY2ggdGhlIGJyYW5jaC5cbiAqIEBwYXJhbSBvcHRpb25zIG9wdGlvbnMuXG4gKi9cbmV4cG9ydCBmdW5jdGlvbiBjaGVja291dChicmFuY2g6IHN0cmluZywgb3B0aW9uczogeyBjcmVhdGVJZk1pc3Npbmc/OiBib29sZWFuIH0gKSB7XG4gIGlmIChvcHRpb25zLmNyZWF0ZUlmTWlzc2luZykge1xuICAgIHRyeSB7XG4gICAgICBzaGVsbC5ydW4oYGdpdCBzaG93LWJyYW5jaCBvcmlnaW4vJHticmFuY2h9YCk7XG4gICAgfSBjYXRjaCAoZSkge1xuICAgICAgaWYgKGUgaW5zdGFuY2VvZiBFcnJvciAmJiBlLm1lc3NhZ2UuaW5jbHVkZXMoJ2ZhdGFsOiBiYWQgc2hhMSByZWZlcmVuY2UnKSkge1xuICAgICAgICBjb25zb2xlLmxvZygnUmVtb3RlIGJyYW5jaCBub3QgZm91bmQsIGNyZWF0aW5nIG5ldyBicmFuY2guJyk7XG4gICAgICAgIHNoZWxsLnJ1bihgZ2l0IGNoZWNrb3V0IC1CICR7YnJhbmNofWApO1xuICAgICAgICByZXR1cm47XG4gICAgICB9XG4gICAgfVxuICB9XG4gIHNoZWxsLnJ1bihgZ2l0IGNoZWNrb3V0ICR7YnJhbmNofWApO1xufVxuXG4vKipcbiAqIEZldGNoIHRoZSBjb25maWd1cmVkIGdpdCB1c2VyIG5hbWUgZm9yIHRoZSBjdXJyZW50IGRpcmVjdG9yeS5cbiAqIFJldHVybnMgdW5kZWZpbmVkIGlmIG5vdCBjb25maWd1cmVkLlxuICovXG5leHBvcnQgZnVuY3Rpb24gdXNlcm5hbWUoKSB7XG4gIHRyeSB7XG4gICAgcmV0dXJuIHNoZWxsLnJ1bignZ2l0IGNvbmZpZyB1c2VyLm5hbWUnLCB7IGNhcHR1cmU6IHRydWUgfSk7XG4gIH0gY2F0Y2ggKGVycikge1xuICAgIGNvbnNvbGUud2FybihlcnIubWVzc2FnZSk7XG4gICAgcmV0dXJuIHVuZGVmaW5lZDtcbiAgfVxufVxuXG4vKipcbiAqIEZldGNoIHRoZSBjb25maWd1cmVkIGdpdCB1c2VyIGVtYWlsIGZvciB0aGUgY3VycmVudCBkaXJlY3RvcnkuXG4gKiBSZXR1cm5zIHVuZGVmaW5lZCBpZiBub3QgY29uZmlndXJlZC5cbiAqL1xuZXhwb3J0IGZ1bmN0aW9uIGVtYWlsKCkge1xuICB0cnkge1xuICAgIHJldHVybiBzaGVsbC5ydW4oJ2dpdCBjb25maWcgdXNlci5lbWFpbCcsIHsgY2FwdHVyZTogdHJ1ZSB9KTtcbiAgfSBjYXRjaCAoZXJyKSB7XG4gICAgY29uc29sZS53YXJuKGVyci5tZXNzYWdlKTtcbiAgICByZXR1cm4gdW5kZWZpbmVkO1xuICB9XG59XG5cbi8qKlxuICogSWRlbnRpZnkgdGhlIGNvbW1pdHRlciB3aXRoIGEgdXNlcm5hbWUgYW5kIGVtYWlsLlxuICpcbiAqIEBwYXJhbSB1c2VyIHRoZSB1c2VybmFtZS5cbiAqIEBwYXJhbSBlbWFpbCB0aGUgZW1haWwgYWRkcmVzcy5cbiAqL1xuZXhwb3J0IGZ1bmN0aW9uIGlkZW50aWZ5KHVzZXI6IHN0cmluZywgYWRkcmVzczogc3RyaW5nKSB7XG4gIHNoZWxsLnJ1bihgZ2l0IGNvbmZpZyB1c2VyLm5hbWUgXCIke3VzZXJ9XCJgKTtcbiAgc2hlbGwucnVuKGBnaXQgY29uZmlnIHVzZXIuZW1haWwgXCIke2FkZHJlc3N9XCJgKTtcbn0iXX0=
|