diff options
| author | Máximo Cuadros <mcuadros@gmail.com> | 2019-05-20 00:16:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-20 00:16:19 +0200 |
| commit | 91db86b5c1068539f3c64d536f8af80503234f41 (patch) | |
| tree | e1f1745266b9512cfa7cb15200188bc38f19dedb /config/branch_test.go | |
| parent | 7bdcd80a8c4ff0dab240d603258ba60b28102683 (diff) | |
| parent | f284cd4c2f97e3143e70e64cad4e6f490a6b49f1 (diff) | |
| download | go-git-91db86b5c1068539f3c64d536f8af80503234f41.tar.gz | |
Merge pull request #1154 from yelirekim/rebase_config
Support the 'rebase' config key for branches
Diffstat (limited to 'config/branch_test.go')
| -rw-r--r-- | config/branch_test.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/config/branch_test.go b/config/branch_test.go index d74122e..2dbe888 100644 --- a/config/branch_test.go +++ b/config/branch_test.go @@ -44,6 +44,7 @@ func (b *BranchSuite) TestMarshall(c *C) { [branch "branch-tracking-on-clone"] remote = fork merge = refs/heads/branch-tracking-on-clone + rebase = interactive `) cfg := NewConfig() @@ -51,6 +52,7 @@ func (b *BranchSuite) TestMarshall(c *C) { Name: "branch-tracking-on-clone", Remote: "fork", Merge: plumbing.ReferenceName("refs/heads/branch-tracking-on-clone"), + Rebase: "interactive", } actual, err := cfg.Marshal() @@ -64,6 +66,7 @@ func (b *BranchSuite) TestUnmarshall(c *C) { [branch "branch-tracking-on-clone"] remote = fork merge = refs/heads/branch-tracking-on-clone + rebase = interactive `) cfg := NewConfig() @@ -73,4 +76,5 @@ func (b *BranchSuite) TestUnmarshall(c *C) { c.Assert(branch.Name, Equals, "branch-tracking-on-clone") c.Assert(branch.Remote, Equals, "fork") c.Assert(branch.Merge, Equals, plumbing.ReferenceName("refs/heads/branch-tracking-on-clone")) + c.Assert(branch.Rebase, Equals, "interactive") } |