fix: remote does not exist error on git fetch when git remote is not set (#9123)

* fix: remote does not exist error on git fetch when git remote is not set

* Adding a unit test

Author: k-anshul

cli/cmd/deploy/deploy_test.go

@@ -63,6 +63,28 @@ func TestManagedDeploy(t *testing.T) {
 
 	// verify changes are pushed to Github repo
 	verifyGithubRepoContents(t, ghClient, resp.Project.GitRemote, changes)
+
+	// clone the project to an empty directory and remove the __rill_remote to simulate fresh deploys in CI/CD
+
+	cloneDir := t.TempDir()
+	cmd := exec.CommandContext(t.Context(), "git", "clone", resp.Project.GitRemote, cloneDir)
+	out, err := cmd.CombinedOutput()
+	require.NoError(t, err, "git clone failed: %s", out)
+
+	// remove __rill_remote to simulate fresh deploys in CI/CD where the git history is not preserved
+	err = os.Remove(filepath.Join(cloneDir, ".git", "refs", "heads", "main"))
+	require.NoError(t, err)
+
+	// deploy again from the cloned directory with changes
+	changes2 := map[string]string{
+		"models/model.sql": `SELECT 2 AS two`,
+	}
+	putFiles(t, cloneDir, changes2)
+	result = u1.Run(t, "deploy", "--interactive=false", "--org=github-test", "--project=rill-mgd-deploy", "--skip-deploy=true", "--path="+cloneDir)
+	require.Equal(t, 0, result.ExitCode, result.Output)
+
+	// verify changes are pushed to Github repo
+	verifyGithubRepoContents(t, ghClient, resp.Project.GitRemote, changes2)
 }
 
 func TestManagedDeployWithPrimaryBranch(t *testing.T) {

cli/pkg/cmdutil/helper.go

@@ -589,8 +589,14 @@ func (h *Helper) HandleRepoTransfer(path, remote string) error {
 //
 // If h.Interactive is true and there are remote commits, the user will be prompted to choose how to proceed.
 func (h *Helper) CommitAndSafePush(ctx context.Context, root string, config *gitutil.Config, commitMsg string, author *object.Signature, defaultPushChoice string) error {
+	// Set remote if not set (go-git complains if we try to fetch without setting remote)
+	err := gitutil.SetRemote(root, config)
+	if err != nil {
+		return fmt.Errorf("failed to set git remote: %w", err)
+	}
+
 	// 1. Fetch latest from remote
-	err := gitutil.GitFetch(ctx, root, config)
+	err = gitutil.GitFetch(ctx, root, config)
 	if err != nil {
 		return fmt.Errorf("failed to fetch from remote: %w", err)
 	}