meadav_david@meadav:~/docker-git$ pnpm run docker-git
> effect-template-workspace@1.0.0 docker-git /home/meadav_david/docker-git
> pnpm --filter ./packages/app build:docker-git && node packages/app/dist/src/docker-git/main.js
> @prover-coder-ai/docker-git@1.0.62 prebuild:docker-git /home/meadav_david/docker-git/packages/app
> pnpm -C ../lib build
> @effect-template/lib@1.0.0 build /home/meadav_david/docker-git/packages/lib
> tsc -p tsconfig.json
> @prover-coder-ai/docker-git@1.0.62 build:docker-git /home/meadav_david/docker-git/packages/app
> vite build --config vite.docker-git.config.ts
vite v7.3.1 building ssr environment for production...
✓ 171 modules transformed.
dist/src/docker-git/main.js 528.66 kB │ map: 1,187.72 kB
✓ built in 861ms
From https://github.com/skulidropek/.docker-git
* branch main -> FETCH_HEAD
Already up to date.
meadav_david@meadav:~/docker-git$ git diff | cat
diff --git a/packages/lib/src/usecases/state-repo.ts b/packages/lib/src/usecases/state-repo.ts
index 6c0b202..71476f2 100644
--- a/packages/lib/src/usecases/state-repo.ts
+++ b/packages/lib/src/usecases/state-repo.ts
@@ -187,9 +187,16 @@ const statePullInternal = (
)
const originUrl = yield* _(normalizeOriginUrlIfNeeded(root, rawOriginUrl))
const token = yield* _(resolveGithubToken(fs, path, root))
+ const branchRaw = yield* _(
+ gitCapture(root, ["rev-parse", "--abbrev-ref", "HEAD"], gitBaseEnv).pipe(
+ Effect.map((value) => value.trim()),
+ Effect.catchAll(() => Effect.succeed("main"))
+ )
+ )
+ const branch = branchRaw === "HEAD" ? "main" : branchRaw
const effect = token && token.length > 0 && isGithubHttpsRemote(originUrl)
- ? withGithubAskpassEnv(token, (env) => git(root, ["pull", "--rebase"], env))
- : git(root, ["pull", "--rebase"], gitBaseEnv)
+ ? withGithubAskpassEnv(token, (env) => git(root, ["pull", "--rebase", "origin", branch], env))
+ : git(root, ["pull", "--rebase", "origin", branch], gitBaseEnv)
yield* _(effect)
}).pipe(Effect.asVoid)
meadav_david@meadav:~/docker-git$
