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

Jump to bottom

Fix detection of no commits when the default branch is not master (#18422) #18423

Merged
merged 3 commits into from
Jan 28, 2022
Merged

Fix detection of no commits when the default branch is not master (#18422) #18423

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
de65b76
Fix broken when no commits and default branch is not master
lunny Jan 27, 2022
7c78059
Fix IsEmpty check
lunny Jan 27, 2022
3a800ef
Improve codes
lunny Jan 28, 2022
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
6 changes: 5 additions & 1 deletion modules/git/repo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,12 @@ func InitRepository(repoPath string, bare bool) error {
func (repo *Repository) IsEmpty() (bool, error) {
var errbuf strings.Builder
if err := NewCommand("log", "-1").RunInDirPipeline(repo.Path, nil, &errbuf); err != nil {
defaultBranch, err := repo.GetDefaultBranch()
if err != nil {
return false, err
}
if strings.Contains(errbuf.String(), "fatal: bad default revision 'HEAD'") ||
strings.Contains(errbuf.String(), "fatal: your current branch 'master' does not have any commits yet") {
strings.Contains(errbuf.String(), fmt.Sprintf("fatal: your current branch '%s' does not have any commits yet", defaultBranch)) {
return true, nil
}
return true, fmt.Errorf("check empty: %v - %s", err, errbuf.String())
Expand Down