diff options
author | Mike Riley <mriley@uber.com> | 2019-05-17 12:18:10 -0400 |
---|---|---|
committer | Mike Riley <mikeriley@yelirekim.com> | 2019-05-17 12:33:55 -0400 |
commit | f284cd4c2f97e3143e70e64cad4e6f490a6b49f1 (patch) | |
tree | d3984d80797aa1bd4d39ac168e66aacead508103 /config/branch_test.go | |
parent | 52fcf7d8a3c2da58769e105a26240e3e697fedeb (diff) | |
download | go-git-f284cd4c2f97e3143e70e64cad4e6f490a6b49f1.tar.gz |
Support the 'rebase' config key for branches
Signed-off-by: Mike Riley <mikeriley@yelirekim.com>
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") } |