Skip to content

Commit 4aa91b7

Browse files
committed
close #193 we need to pull when setting up a new workspace
1 parent 1834071 commit 4aa91b7

File tree

3 files changed

+5
-10
lines changed

3 files changed

+5
-10
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
*.a
55
*.so
66

7+
git-phlow
8+
79
# Folders
810
_obj
911
_test

main.go

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,9 @@
11
package main
22

33
import (
4-
"github.com/praqma/git-phlow/setting"
5-
"fmt"
4+
"github.com/praqma/git-phlow/cmd"
65
)
76

87
func main() {
9-
//cmd.Execute()
10-
11-
proj := setting.NewProjectStg("default")
12-
13-
err := setting.ValidateLoadedSetting(proj)
14-
fmt.Println(err)
15-
8+
cmd.Execute()
169
}

phlow/workon.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
func WorkOn(issue int) {
1717
ui.PhlowSpinner.Start("Setting up workspace")
1818
defer ui.PhlowSpinner.Stop()
19-
if err := githandler.Fetch(); err != nil {
19+
if _, err := githandler.Pull(); err != nil {
2020
fmt.Println(err)
2121
return
2222
}

0 commit comments

Comments
 (0)