Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Leopard <mleopard@gitlab.com>2018-12-17 15:27:40 +0300
committerMichael Leopard <mleopard@gitlab.com>2018-12-17 15:27:40 +0300
commitb840993d267945b4441a79ce888575d4d4bac614 (patch)
tree4beb75deb06a2543509223ad23fc80bff6fa8f05
parente6b9ccdcebc2b24e04b40ed995334848c9fe365f (diff)
Removing whitespace. Adding generic err return.
-rw-r--r--internal/service/ref/branches.go5
1 files changed, 1 insertions, 4 deletions
diff --git a/internal/service/ref/branches.go b/internal/service/ref/branches.go
index ac9b24c3f..d0f4daf04 100644
--- a/internal/service/ref/branches.go
+++ b/internal/service/ref/branches.go
@@ -57,23 +57,21 @@ func (s *server) FindBranch(ctx context.Context, req *gitalypb.FindBranchRequest
}
cmd, err := git.Command(ctx, repo, "for-each-ref", "--format", "'%(objectname) %(refname)'", fmt.Sprintf("refs/heads/%s", string(refName)))
-
if err != nil {
return nil, err
}
reader := bufio.NewReader(cmd)
line, _, err := reader.ReadLine()
-
if err != nil {
if err == io.EOF {
return &gitalypb.FindBranchResponse{}, nil
}
+ return nil, err
}
var name []byte
var revision []byte
-
if splitLine := bytes.Split(line[1:len(line)-1], []byte(" ")); len(splitLine) == 2 {
revision = splitLine[0]
name = bytes.TrimPrefix(splitLine[1], []byte("refs/heads/"))
@@ -82,7 +80,6 @@ func (s *server) FindBranch(ctx context.Context, req *gitalypb.FindBranchRequest
}
commit, err := log.GetCommit(ctx, repo, string(revision))
-
if err != nil {
return nil, err
}