[content-service] Fix git init default branch in tests (#21222)

* [content-service] Fix git init default branch in tests

The tests were failing in CI because they depend on git's default branch
configuration. The git client sets HOME=/home/gitpod where no .gitconfig
exists, causing git to fall back to 'master' as the default branch.

This fix explicitly sets --initial-branch=main for all git init calls
in tests, making them deterministic regardless of the environment's
git configuration.

Co-authored-by: Ona <no-reply@ona.com>

* [supervisor] Update test expectations for HISTFILE command

The getCommand function now prepends a HISTFILE command for non-headless
tasks to enable bash history. Updated test expectations to match the new
output format.

Co-authored-by: Ona <no-reply@ona.com>

---------

Co-authored-by: Ona <no-reply@ona.com>

Author: geropl

components/content-service/pkg/git/git_test.go

@@ -30,7 +30,7 @@ func TestGitStatus(t *testing.T) {
 		{
 			"no commits",
 			func(ctx context.Context, c *Client) error {
-				if err := c.Git(ctx, "init"); err != nil {
+				if err := c.Git(ctx, "init", "--initial-branch=main"); err != nil {
 					return err
 				}
 				return nil
@@ -239,7 +239,7 @@ func TestGitStatusFromFiles(t *testing.T) {
 		{
 			"no commits",
 			func(ctx context.Context, c *Client) error {
-				if err := c.Git(ctx, "init"); err != nil {
+				if err := c.Git(ctx, "init", "--initial-branch=main"); err != nil {
 					return err
 				}
 				return nil
@@ -488,8 +488,9 @@ func newGitClient(ctx context.Context) (*Client, error) {
 	return &Client{
 		Location: loc,
 		Config: map[string]string{
-			"user.email": "foo@bar.com",
-			"user.name":  "tester",
+			"user.email":         "foo@bar.com",
+			"user.name":          "tester",
+			"init.defaultBranch": "main",
 		},
 	}, nil
 }
@@ -499,7 +500,7 @@ func initFromRemote(ctx context.Context, c *Client) error {
 	if err != nil {
 		return xerrors.Errorf("cannot add remote: %w", err)
 	}
-	if err := remote.Git(ctx, "init"); err != nil {
+	if err := remote.Git(ctx, "init", "--initial-branch=main"); err != nil {
 		return err
 	}
 	if err := remote.Git(ctx, "config", "--local", "user.email", "foo@bar.com"); err != nil {

components/supervisor/pkg/supervisor/tasks_test.go

@@ -280,19 +280,19 @@ func TestGetTask(t *testing.T) {
 			Name:          "from prebuild",
 			Task:          allTasks,
 			ContentSource: csapi.WorkspaceInitFromPrebuild,
-			Expectation:   "{\nbefore\n} && {\n[ -r /workspace/.prebuild-log-0 ] && cat /workspace/.prebuild-log-0; [ -r //prebuild-log-0 ] && cat //prebuild-log-0; true\n} && {\ncommand\n}",
+			Expectation:   " HISTFILE=//cmd-0 history -r; {\nbefore\n} && {\n[ -r /workspace/.prebuild-log-0 ] && cat /workspace/.prebuild-log-0; [ -r //prebuild-log-0 ] && cat //prebuild-log-0; true\n} && {\ncommand\n}",
 		},
 		{
 			Name:          "from other",
 			Task:          allTasks,
 			ContentSource: csapi.WorkspaceInitFromOther,
-			Expectation:   "{\nbefore\n} && {\ninit\n} && {\ncommand\n}",
+			Expectation:   " HISTFILE=//cmd-0 history -r; {\nbefore\n} && {\ninit\n} && {\ncommand\n}",
 		},
 		{
 			Name:          "from backup",
 			Task:          allTasks,
 			ContentSource: csapi.WorkspaceInitFromOther,
-			Expectation:   "{\nbefore\n} && {\ninit\n} && {\ncommand\n}",
+			Expectation:   " HISTFILE=//cmd-0 history -r; {\nbefore\n} && {\ninit\n} && {\ncommand\n}",
 		},
 	}