From c55a027da3fd71359bc6b622652a22fdeb280a80 Mon Sep 17 00:00:00 2001
From: Ethan Koenig <ethantkoenig@gmail.com>
Date: Sun, 28 Jan 2018 04:27:42 -0700
Subject: [PATCH] Fix empty checkout bug (#3419)
---
models/repo.go | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/models/repo.go b/models/repo.go
index 59d2336781..4214198567 100644
--- a/models/repo.go
+++ b/models/repo.go
@@ -774,17 +774,17 @@ func UpdateLocalCopyBranch(repoPath, localPath, branch string) error {
return fmt.Errorf("git clone %s: %v", branch, err)
}
} else {
- if err := git.Checkout(localPath, git.CheckoutOptions{
- Branch: branch,
- }); err != nil {
- return fmt.Errorf("git checkout %s: %v", branch, err)
- }
-
_, err := git.NewCommand("fetch", "origin").RunInDir(localPath)
if err != nil {
return fmt.Errorf("git fetch origin: %v", err)
}
if len(branch) > 0 {
+ if err := git.Checkout(localPath, git.CheckoutOptions{
+ Branch: branch,
+ }); err != nil {
+ return fmt.Errorf("git checkout %s: %v", branch, err)
+ }
+
if err := git.ResetHEAD(localPath, true, "origin/"+branch); err != nil {
return fmt.Errorf("git reset --hard origin/%s: %v", branch, err)
}