💡 Refer to upstream directly when creating new branch (#6)

vuejs-jp · Nov 11, 2017 · 8711a9b · 8711a9b
1 parent 2a472ff
commit 8711a9b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/index.js b/index.js
@@ -69,7 +69,7 @@ function setupHeadFeeder() {
       }
 
       repo.fetchAllRemotes()
-      repo.updateLocal()
+      repo.updateDefaultBranch()
       repo.createNewBranch(shortHash)
 
       if (repo.hasConflicts('cherry-pick', hash)) {

diff --git a/lib/repository.js b/lib/repository.js
@@ -18,9 +18,15 @@ class Repository {
       Git.exec(`remote add ${this.remote.head.name} ${this.remote.head.url}`)
       Git.exec(`config user.name "${this.user.name}"`)
       Git.exec(`config user.email "${this.user.email}"`)
+      this.fetchUpstream()
+      if (this.remote.origin.defaultBranch === this.remote.upstream.defaultBranch) {
+        this.createNewBranch('tmp')
+        Git.exec(`branch -D ${this.remote.origin.defaultBranch}`)
+      }
+      this.createNewBranch(`${this.remote.upstream.defaultBranch} ${this.remote.upstream.name}/${this.remote.upstream.defaultBranch}`)
     }
     this.resetChanges()
-    this.checkputDefaultBranch()
+    this.checkoutDefaultBranch()
     Git.exec('branch | grep -v "*" | xargs git branch -D')
   }
 
@@ -29,7 +35,8 @@ class Repository {
     this.fetchHead()
   }
 
-  updateLocal() {
+  updateDefaultBranch() {
+    this.checkoutDefaultBranch()
     this.mergeUpstream()
   }
 
@@ -38,17 +45,15 @@ class Repository {
   }
 
   mergeUpstream() {
-    this.checkputDefaultBranch()
     Git.merge(`${this.remote.upstream.name}/${this.remote.upstream.defaultBranch}`)
-    this.updateRemote(this.remote.origin.defaultBranch)
   }
 
   fetchHead() {
     Git.fetch(this.remote.head.name, this.remote.head.defaultBranch)
   }
 
-  checkputDefaultBranch() {
-    Git.checkout(this.remote.origin.defaultBranch)
+  checkoutDefaultBranch() {
+    Git.checkout(this.remote.upstream.defaultBranch)
   }
 
   updateRemote(branchName) {