Default to origin master for git pull (gopasspw#819)

Fixes gopasspw#815
vbargl · May 31, 2018 · 71f9ad6 · 71f9ad6
1 parent 411be84
commit 71f9ad6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/commands_test.go b/commands_test.go
@@ -36,7 +36,6 @@ var commandsWithError = map[string]struct{}{
 	".edit":                  {},
 	".find":                  {},
 	".generate":              {},
-	".git.pull":              {},
 	".git.push":              {},
 	".git.remote.add":        {},
 	".git.remote.remove":     {},

diff --git a/pkg/action/git.go b/pkg/action/git.go
@@ -106,8 +106,11 @@ func (s *Action) GitPull(ctx context.Context, c *cli.Context) error {
 	origin := c.Args().Get(0)
 	branch := c.Args().Get(1)
 
-	if origin == "" || branch == "" {
-		return ExitError(ctx, ExitUsage, nil, "Usage: %s git pull <ORIGIN> <BRANCH>", s.Name)
+	if origin == "" {
+		origin = "origin"
+	}
+	if branch == "" {
+		branch = "master"
 	}
 	return s.Store.GitPull(ctx, store, origin, branch)
 }

diff --git a/pkg/action/git_test.go b/pkg/action/git_test.go
@@ -68,7 +68,7 @@ func TestGit(t *testing.T) {
 	buf.Reset()
 
 	// GitPull
-	assert.Error(t, act.GitPull(ctx, c))
+	assert.NoError(t, act.GitPull(ctx, c))
 	buf.Reset()
 
 	// GitPush