Merge d1a478a into ddd3434

lipp · Jul 21, 2016 · 3cf68f9 · 3cf68f9
2 parents ddd3434 + d1a478a
commit 3cf68f9
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/lib/repo.js b/lib/repo.js
@@ -92,7 +92,9 @@ module.exports.checkout = function (repoUrl, branch, dir) {
         execThrow('git clean -fdx', options)
         execThrow('git ' + ['fetch', '--all'].join(' '), options)
         execThrow('git ' + ['checkout', branch].join(' '), options)
-        execThrow('git ' + ['pull', 'origin', branch].join(' '), options)
+        if (execThrow('git tag -l ' + branch, options) !== branch) {
+          execThrow('git ' + ['reset', '--hard', 'origin/' + branch].join(' '), options)
+        }
       } else {
         fse.mkdirsSync(gitDir)
         execThrow('git ' + ['clone', repoUrl, './'].join(' '), options)