[content-init] Don't fail when origin is an empty repository #4337

jankeromnes · 2021-05-28T14:17:35Z

Note: This is similar to the 'git stash -u' error when repositories are empty, so the fix is mostly a copy of:

gitpod/components/content-service/pkg/initializer/prebuild.go

Lines 88 to 93 in b43fbfa

    
           out, err := p.Git.GitWithOutput(ctx, "stash", "push", "-u") 
        
           if err != nil { 
        
           	var giterr git.OpFailedError 
        
           	if errors.As(err, &giterr) && strings.Contains(giterr.Output, "You do not have the initial commit yet") { 
        
           		// git stash push returns a non-zero exit code if the repository does not have a single commit. 
        
           		// In this case that's not an error though, hence we don't want to fail here.

csweichel

LGTM

[content-init] Don't fail when origin is empty

0041932

jankeromnes marked this pull request as ready for review May 28, 2021 14:46

csweichel approved these changes May 28, 2021

View reviewed changes

jankeromnes merged commit 360176f into main May 28, 2021

jankeromnes deleted the jx/fix-empty-repo-init branch May 28, 2021 14:52

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[content-init] Don't fail when origin is an empty repository #4337

[content-init] Don't fail when origin is an empty repository #4337

jankeromnes commented May 28, 2021 •

edited

Loading

csweichel left a comment

	out, err := p.Git.GitWithOutput(ctx, "stash", "push", "-u")
	if err != nil {
	var giterr git.OpFailedError
	if errors.As(err, &giterr) && strings.Contains(giterr.Output, "You do not have the initial commit yet") {
	// git stash push returns a non-zero exit code if the repository does not have a single commit.
	// In this case that's not an error though, hence we don't want to fail here.

[content-init] Don't fail when origin is an empty repository #4337

[content-init] Don't fail when origin is an empty repository #4337

Conversation

jankeromnes commented May 28, 2021 • edited Loading

csweichel left a comment

Choose a reason for hiding this comment

jankeromnes commented May 28, 2021 •

edited

Loading