Skip to content

Fix e2e merge-command assertion broken by the ff-only step #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Phlogistique merged 1 commit into from
Jun 9, 2026
+1 −1
Merged

Fix e2e merge-command assertion broken by the ff-only step #44

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tests/test_e2e.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ assert_conflict_comment_merges() {
expected+="git merge $conflict"$'\n'
done
expected=${expected%$'\n'}
actual=$(echo "$comment" | grep -E '^git merge' | sed 's/ *#.*//' || true)
actual=$(echo "$comment" | grep -E '^git merge' | grep -v -- '--ff-only' | sed 's/ *#.*//' || true)

if [[ "$actual" == "$expected" ]]; then
echo >&2 "✅ Verification Passed: conflict comment lists expected merge command(s)."
Expand Down
Loading