git: Move ShowRefDecoder into git package

3 files changed, 6 insertions, 8 deletions

diff --git a/internal/backup/backup.go b/internal/backup/backup.go
index 016fb2e67..b26e47466 100644
--- a/internal/backup/backup.go
+++ b/internal/backup/backup.go
@@ -337,7 +337,7 @@ func (mgr *Manager) sendKnownRefs(ctx context.Context, step *Step, repo *gitalyp
 	}
 	defer reader.Close()
 
-	d := NewShowRefDecoder(reader)
+	d := git.NewShowRefDecoder(reader)
 	for {
 		var ref git.Reference
 
diff --git a/internal/backup/refs.go b/internal/git/decoder.go
index 1bb8eb9b7..5d960110f 100644
--- a/internal/backup/refs.go
+++ b/internal/git/decoder.go
@@ -1,12 +1,10 @@
-package backup
+package git
 
 import (
 	"bufio"
 	"fmt"
 	"io"
 	"strings"
-
-	"gitlab.com/gitlab-org/gitaly/v14/internal/git"
 )
 
 // ShowRefDecoder parses the output format of git-show-ref
@@ -24,7 +22,7 @@ func NewShowRefDecoder(r io.Reader) *ShowRefDecoder {
 
 // Decode reads and parses the next reference. Returns io.EOF when the end of
 // the reader has been reached.
-func (d *ShowRefDecoder) Decode(ref *git.Reference) error {
+func (d *ShowRefDecoder) Decode(ref *Reference) error {
 	if d.err != nil {
 		return d.err
 	}
@@ -44,7 +42,7 @@ func (d *ShowRefDecoder) Decode(ref *git.Reference) error {
 		return fmt.Errorf("show-ref decoder: invalid line: %q", line)
 	}
 
-	*ref = git.NewReference(git.ReferenceName(splits[1]), splits[0])
+	*ref = NewReference(ReferenceName(splits[1]), splits[0])
 
 	return nil
 }
diff --git a/internal/backup/refs_test.go b/internal/git/decoder_test.go
index 3f78dfe19..90c7f4e35 100644
--- a/internal/backup/refs_test.go
+++ b/internal/git/decoder_test.go
@@ -1,4 +1,4 @@
-package backup
+package git_test
 
 import (
 	"bytes"
@@ -31,7 +31,7 @@ func TestShowRefDecoder(t *testing.T) {
 	output := gittest.Exec(t, cfg, "-C", repoPath, "show-ref")
 	stream := bytes.NewBuffer(output)
 
-	d := NewShowRefDecoder(stream)
+	d := git.NewShowRefDecoder(stream)
 
 	var refs []git.Reference
 	for {