Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: fallback to empty tree sha when no upstream set #687

Merged
merged 1 commit into from
Apr 2, 2024
Merged

fix: fallback to empty tree sha when no upstream set #687

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 17 additions & 0 deletions internal/git/repository.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ import (
"strings"

"github.com/spf13/afero"

"github.com/evilmartians/lefthook/internal/log"
)

const (
Expand All @@ -33,6 +35,7 @@ var (
cmdStageFiles = []string{"git", "add"}
cmdRemotes = []string{"git", "branch", "--remotes"}
cmdHideUnstaged = []string{"git", "checkout", "--force", "--"}
cmdEmptyTreeSHA = []string{"git", "hash-object", "-t", "tree", "/dev/null"}
)

// Repository represents a git repository.
Expand All @@ -45,6 +48,7 @@ type Repository struct {
InfoPath string
unstagedPatchPath string
headBranch string
emptyTreeSHA string
}

// NewRepository returns a Repository or an error, if git repository it not initialized.
Expand Down Expand Up @@ -82,6 +86,11 @@ func NewRepository(fs afero.Fs, git Exec) (*Repository, error) {
gitPath = filepath.Join(rootPath, gitPath)
}

emptyTreeSHA, err := git.Cmd(cmdEmptyTreeSHA)
if err != nil {
log.Debug("Couldn't get empty tree SHA value, not critical")
}

git.SetRootPath(rootPath)

return &Repository{
Expand All @@ -92,6 +101,7 @@ func NewRepository(fs afero.Fs, git Exec) (*Repository, error) {
GitPath: gitPath,
InfoPath: infoPath,
unstagedPatchPath: filepath.Join(infoPath, unstagedPatchName),
emptyTreeSHA: emptyTreeSHA,
}, nil
}

Expand Down Expand Up @@ -120,6 +130,7 @@ func (r *Repository) PushFiles() ([]string, error) {
if err != nil {
return nil, err
}

for _, branch := range branches {
if !headBranchRegexp.MatchString(branch) {
continue
Expand All @@ -130,6 +141,12 @@ func (r *Repository) PushFiles() ([]string, error) {
break
}
}

// Nothing has been pushed yet or upstream is not set
if len(r.headBranch) == 0 {
r.headBranch = r.emptyTreeSHA
}

return r.FilesByCommand(append(cmdPushFilesHead, r.headBranch))
}

Expand Down
Loading