Skip to content

Fix incorrect filename coloring in tig status#1326

Closed
xaizek wants to merge 1 commit intojonas:masterfrom
xaizek:fix-filename-colors-in-status
Closed

Fix incorrect filename coloring in tig status#1326
xaizek wants to merge 1 commit intojonas:masterfrom
xaizek:fix-filename-colors-in-status

Conversation

@xaizek
Copy link
Copy Markdown
Contributor

@xaizek xaizek commented Apr 7, 2024

Due to the way commit a37ce5c updated src/draw.c:draw_filename() the whole line in tig status got colored according to stat-* which supposed to color only status markers.


I don't see other such adhoc conditionals in the file, so there is probably a better way of doing it, but I thought this demonstrates the issue and the approximate way of addressing it.

@koutcher
Copy link
Copy Markdown
Collaborator

koutcher commented Apr 7, 2024

Good catch, thanks for the proposition. I think I'd rather revert the changes in draw_filename() as they were made only to match changes draw_filesize() where they were needed to skip the display of size for submodules.

@xaizek xaizek force-pushed the fix-filename-colors-in-status branch from 74f534f to aecf5e0 Compare April 7, 2024 21:01
Due to the way commit a37ce5c updated
src/draw.c:draw_filename() the whole line in `tig status` got colored
according to `stat-*` which are supposed to color only status markers.

This reverts part of that commit which was done for consistency with the
changes made to draw_filesize().
@xaizek xaizek force-pushed the fix-filename-colors-in-status branch from aecf5e0 to 9aa3c6e Compare April 7, 2024 21:04
koutcher pushed a commit that referenced this pull request Apr 11, 2024
Due to the way commit a37ce5c updated
src/draw.c:draw_filename() the whole line in `tig status` got colored
according to `stat-*` which are supposed to color only status markers.

This reverts part of that commit which was done for consistency with the
changes made to draw_filesize().

[tk: also revert and rework draw_file_size() for consistency and add
 comments.]
@koutcher koutcher closed this Apr 11, 2024
@xaizek xaizek deleted the fix-filename-colors-in-status branch April 11, 2024 20:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants