Skip to content

fix: exclude empty changes from statusline trunk count #27

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
muloka merged 1 commit into from
Mar 15, 2026
Merged

fix: exclude empty changes from statusline trunk count #27

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
12 changes: 9 additions & 3 deletions plugins/project-setup-jj/scripts/statusline-jj.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,18 @@ else
if [ "$ON_TRUNK" = "yes" ]; then
TRUNK_STATE="@trunk"
else
# Count changes between trunk and @
AHEAD=$(jj log -r 'trunk()..@' --no-graph -T '"x"' 2>/dev/null | wc -c | tr -d ' ')
# Count non-empty changes between trunk and @
AHEAD=$(jj log -r '(trunk()..@) ~ empty()' --no-graph -T '"x"' 2>/dev/null | wc -c | tr -d ' ')
if [ "$AHEAD" -gt 0 ] 2>/dev/null; then
TRUNK_STATE="+${AHEAD}"
else
TRUNK_STATE="⎇"
# All changes are empty — check if descended from trunk at all
ALL=$(jj log -r 'trunk()..@' --no-graph -T '"x"' 2>/dev/null | wc -c | tr -d ' ')
if [ "$ALL" -gt 0 ] 2>/dev/null; then
TRUNK_STATE="@trunk"
else
TRUNK_STATE="⎇"
fi
fi
fi

Expand Down
Loading