Merge pull request #134 from JarvusInnovations/develop

Release: hologit v0.37.1
JarvusInnovations · Mar 19, 2021 · 861df50 · 861df50
2 parents 5480a3e + 53e6c97
commit 861df50
Show file tree

Hide file tree

Showing 3 changed files with 3,626 additions and 1,855 deletions.
diff --git a/commands/branch/pull.js b/commands/branch/pull.js
@@ -42,10 +42,10 @@ exports.handler = async function pull ({ name, all, force }) {
     // get remote refs
     const remoteRefs = (await git.forEachRef('refs/remotes', { format: '%(refname)' })).split('\n');
 
-    
+
     // check each remote ref
     for (const remoteRef of remoteRefs) {
-        const [remoteCommit, remoteHolobranch] = (await git.show(remoteRef, { format: 'format:%H\n%(trailers:key=Source-holobranch,valueonly)' })).split('\n');
+        const [remoteCommit, remoteHolobranch] = (await git.show(remoteRef, { format: 'format:%H\n%(trailers:key=Source-holobranch,valueonly)', 'no-patch': true })).split('\n');
 
         // skip remotes without documented source holobranch on their latest commit
         if (!remoteHolobranch) {