squibid/XD
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add new eyes for when the current repo is in the middle of a merge

Browse source
This commit is contained in:
Squibid 2025-04-25 02:48:47 -05:00
parent 68634537c0
commit 0e3a7a84e6
3 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
XD.1
View file

@ -24,6 +24,7 @@ c;l.
:;default :;default
\;;in a git repo \;;in a git repo
8;in a git repo with stashed changes 8;in a git repo with stashed changes
X;in a git repo during a merge
B;in a git repo with no commits B;in a git repo with no commits
.TE .TE
.Ss Nose .Ss Nose

3
XD.c
View file

@ -287,6 +287,9 @@ main(int argc, char *argv[])
if (has_stashes(repo)) { if (has_stashes(repo)) {
E("The current git repo has stashed changes.") E("The current git repo has stashed changes.")
P("8"); /* goggle eyes if we have some stashed changes */ P("8"); /* goggle eyes if we have some stashed changes */
} else if (git_repository_state(repo) == GIT_REPOSITORY_STATE_MERGE) {
E("The current git repo is in the middle of a merge.")
P("X"); /* laughing eyes cause the user is fucked */
} else if (git_repository_is_empty(repo)) { } else if (git_repository_is_empty(repo)) {
E("This is a new git repo.") E("This is a new git repo.")
P("B"); /* sunglasses if we're in a new repo with no HEAD */ P("B"); /* sunglasses if we're in a new repo with no HEAD */

2
config.mk
View file

@ -1,4 +1,4 @@
VERSION = 3.0 VERSION = 3.2
PKG_CONFIG = pkg-config PKG_CONFIG = pkg-config