Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion internal/clients/git/git.go
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,7 @@ func (s *Repo) UpdateIndex(idx *IndexOptions) error {
e.Mode = fromEntry.Mode
}
}
return nil
return s.storer.SetIndex(toIdx)
}
func Clone(opts CloneOptions) (*Repo, error) {
return clone(context.Background(), opts)
Expand Down
51 changes: 51 additions & 0 deletions internal/clients/git/git_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@ import (
"errors"
"fmt"
"os"
"path"
"strings"
"testing"

"github.com/go-git/go-git/v5/plumbing/filemode"
"github.com/go-git/go-git/v5/plumbing/object"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
Expand Down Expand Up @@ -336,3 +338,52 @@ func TestIsFuncInGitCommitHistory_complex(t *testing.T) {
err = repo.Push("origin", "new-branch", false)
require.NoError(t, err)
}

func TestCommitPreservesFileMode(t *testing.T) {
baseRepo := BaseSuite{}
baseRepo.BuildBasicRepository()

writeFile := func(t *testing.T, repo *Repo, name string, perm os.FileMode) {
t.Helper()
require.NoError(t, repo.FS().MkdirAll(path.Dir(name), 0755))
f, err := repo.FS().OpenFile(name, os.O_RDWR|os.O_CREATE|os.O_TRUNC, perm)
require.NoError(t, err)
_, err = f.Write([]byte("#!/bin/sh\necho hi\n"))
require.NoError(t, err)
require.NoError(t, f.Close())
}

files := []string{"run.sh", "scripts/nested/run.sh"}

origin, err := Clone(CloneOptions{URL: baseRepo.GetBasicLocalRepositoryURL(), Branch: "master"})
require.NoError(t, err)
defer origin.Cleanup()
for _, name := range files {
writeFile(t, origin, name, 0755)
}
_, err = origin.Commit(".", "Add executables", &IndexOptions{})
require.NoError(t, err)

target, err := Clone(CloneOptions{URL: baseRepo.GetBasicLocalRepositoryURL(), Branch: "master"})
require.NoError(t, err)
defer target.Cleanup()
for _, name := range files {
writeFile(t, target, name, 0644)
}
hash, err := target.Commit(".", "Copy executables", &IndexOptions{
OriginRepo: origin,
FromPath: "/",
ToPath: "/",
})
require.NoError(t, err)

commit, err := target.repo.CommitObject(hash)
require.NoError(t, err)
tree, err := commit.Tree()
require.NoError(t, err)
for _, name := range files {
entry, err := tree.FindEntry(name)
require.NoError(t, err)
assert.Equal(t, filemode.Executable, entry.Mode, name)
}
}
Loading