diff --git a/src/commands/new_branch.js b/src/commands/new.js similarity index 92% rename from src/commands/new_branch.js rename to src/commands/new.js index d002fb2..4849897 100644 --- a/src/commands/new_branch.js +++ b/src/commands/new.js @@ -38,7 +38,7 @@ async function getBaseBranch(branch) { module.exports = async (yargs) => { -// await checkWorkspaceClean(); + await checkWorkspaceClean(); const branch = yargs.branch; @@ -59,7 +59,5 @@ module.exports = async (yargs) => { await Git().addConfig( `branch.${branch}.mikado-base`, base ); await Git().addConfig( `branch.${branch}.mikado-upstream`, upstream ); - await Git().addConfig( `branch.${upstream}.mikado-dependency`, branch, true ); - report.success('done!'); } diff --git a/src/git-mikado.js b/src/git-mikado.js index 9ff76b2..8488b7b 100644 --- a/src/git-mikado.js +++ b/src/git-mikado.js @@ -1,8 +1,10 @@ const yargs = require("yargs"); -const new_branch = require("./commands/new_branch"); + +const new = require("./commands/new"); const status = require("./commands/status"); const done = require("./commands/done"); const upstream = require("./commands/upstream"); + const { currentBranch } = require('./utils'); currentBranch().then( @@ -64,7 +66,7 @@ yargs }) .demandOption(["branch"]); }, - new_branch + new ) .fail((msg, err, yargs) => { try {