💡 Re-create branch from latest default branch (#16)

vuejs-jp · Feb 4, 2018 · c8b3227 · c8b3227
1 parent f443d99
commit c8b3227
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/index.js b/index.js
@@ -88,6 +88,7 @@ const setupHeadFeeder = () => {
 
           repo.fetchAllRemotes()
           repo.updateDefaultBranch()
+          repo.deleteOldBranch(shortHash)
           repo.createNewBranch(shortHash)
 
           if (repo.hasConflicts('cherry-pick', hash)) {

diff --git a/lib/repository.js b/lib/repository.js
@@ -68,6 +68,10 @@ class Repository {
     return Git.exec(`branch -a | grep -c remotes/origin/${branchName}`).stdout.replace('\n', '') === '1'
   }
 
+  deleteOldBranch(branchName) {
+    return Git.exec(`branch -D ${branchName}`)
+  }
+
   createNewBranch(branchName) {
     return Git.checkout(branchName, '-b')
   }