Skip to content

Commit 44cd732

Browse files
durandomclaude
andauthored
fix(fullsend): set git identity before rebase in pre-fix-rebase.sh (#3471)
CI runners lack git user.name/email — rebase fails with "fatal: empty ident name" which was misreported as "conflicts." Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
1 parent 0d1ea32 commit 44cd732

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

.fullsend/customized/scripts/pre-fix-rebase.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ bash scripts/pre-fix.sh
1414

1515
# 2. Rebase PR branch onto target branch
1616
cd "${REPO_DIR}"
17+
git config user.name "fullsend-ai-coder[bot]"
18+
git config user.email "fullsend-ai-coder[bot]@users.noreply.github.com"
1719
git fetch origin "${TARGET_BRANCH}"
1820

1921
CURRENT_HEAD="$(git rev-parse HEAD)"
@@ -30,7 +32,7 @@ echo "Branch is ${BEHIND_COUNT} commit(s) behind origin/${TARGET_BRANCH}. Rebasi
3032

3133
if ! git rebase "origin/${TARGET_BRANCH}" 2>&1; then
3234
git rebase --abort 2>/dev/null || true
33-
echo "::error::Rebase onto origin/${TARGET_BRANCH} failed with conflicts." >&2
35+
echo "::error::Rebase onto origin/${TARGET_BRANCH} failed (check log above for cause)." >&2
3436
echo "::error::Please rebase manually and re-trigger /fs-fix." >&2
3537
exit 1
3638
fi

0 commit comments

Comments
 (0)