Skip to content

Commit

Permalink
Merge pull request #941 from djmoch/filestats-rename
Browse files Browse the repository at this point in the history
plumbing: object, enable renames in getFileStatsFromFilePatches
  • Loading branch information
pjbgf authored Dec 1, 2023
2 parents ae552ce + aebf868 commit 4f61489
Show file tree
Hide file tree
Showing 2 changed files with 56 additions and 2 deletions.
4 changes: 2 additions & 2 deletions plumbing/object/patch.go
Original file line number Diff line number Diff line change
Expand Up @@ -317,8 +317,8 @@ func getFileStatsFromFilePatches(filePatches []fdiff.FilePatch) FileStats {
// File is deleted.
cs.Name = from.Path()
} else if from.Path() != to.Path() {
// File is renamed. Not supported.
// cs.Name = fmt.Sprintf("%s => %s", from.Path(), to.Path())
// File is renamed.
cs.Name = fmt.Sprintf("%s => %s", from.Path(), to.Path())
} else {
cs.Name = from.Path()
}
Expand Down
54 changes: 54 additions & 0 deletions plumbing/object/patch_stats_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
package object_test

import (
"time"

"github.com/go-git/go-billy/v5/memfs"
"github.com/go-git/go-billy/v5/util"
"github.com/go-git/go-git/v5"
"github.com/go-git/go-git/v5/plumbing/object"
"github.com/go-git/go-git/v5/storage/memory"

fixtures "github.com/go-git/go-git-fixtures/v4"
. "gopkg.in/check.v1"
)

type PatchStatsSuite struct {
fixtures.Suite
}

var _ = Suite(&PatchStatsSuite{})

func (s *PatchStatsSuite) TestStatsWithRename(c *C) {
cm := &git.CommitOptions{
Author: &object.Signature{Name: "Foo", Email: "foo@example.local", When: time.Now()},
}

fs := memfs.New()
r, err := git.Init(memory.NewStorage(), fs)
c.Assert(err, IsNil)

w, err := r.Worktree()
c.Assert(err, IsNil)

util.WriteFile(fs, "foo", []byte("foo\nbar\n"), 0644)

_, err = w.Add("foo")
c.Assert(err, IsNil)

_, err = w.Commit("foo\n", cm)
c.Assert(err, IsNil)

_, err = w.Move("foo", "bar")
c.Assert(err, IsNil)

hash, err := w.Commit("rename foo to bar", cm)
c.Assert(err, IsNil)

commit, err := r.CommitObject(hash)
c.Assert(err, IsNil)

fileStats, err := commit.Stats()
c.Assert(err, IsNil)
c.Assert(fileStats[0].Name, Equals, "foo => bar")
}

0 comments on commit 4f61489

Please sign in to comment.