27 lines
818 B
JavaScript
27 lines
818 B
JavaScript
'use strict';
|
|
|
|
var log = require('fancy-log');
|
|
var exec = require('child_process').exec;
|
|
var escape = require('any-shell-escape');
|
|
|
|
module.exports = function (branch, opt, cb) {
|
|
if (!cb && typeof opt === 'function') {
|
|
// optional options
|
|
cb = opt;
|
|
opt = {};
|
|
}
|
|
if (!cb || typeof cb !== 'function') cb = function () {};
|
|
if (!opt) opt = {};
|
|
if (!branch) return cb && cb(new Error('gulp-git: Branch name is require git.merge("name")'));
|
|
if (!opt.cwd) opt.cwd = process.cwd();
|
|
if (!opt.args) opt.args = ' ';
|
|
|
|
var maxBuffer = opt.maxBuffer || 200 * 1024;
|
|
|
|
var cmd = 'git merge ' + opt.args + ' ' + escape([branch]);
|
|
return exec(cmd, {cwd: opt.cwd, maxBuffer: maxBuffer}, function(err, stdout, stderr) {
|
|
if (err) return cb(err);
|
|
if (!opt.quiet) log(stdout, stderr);
|
|
cb();
|
|
});
|
|
};
|