From 0e3a7a84e6a90f3ff4ce22307239925d5bbca685 Mon Sep 17 00:00:00 2001 From: Squibid Date: Fri, 25 Apr 2025 02:48:47 -0500 Subject: add new eyes for when the current repo is in the middle of a merge --- XD.1 | 1 + XD.c | 3 +++ config.mk | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/XD.1 b/XD.1 index 65361c0..47254d8 100644 --- a/XD.1 +++ b/XD.1 @@ -24,6 +24,7 @@ c;l. :;default \;;in a git repo 8;in a git repo with stashed changes + X;in a git repo during a merge B;in a git repo with no commits .TE .Ss Nose diff --git a/XD.c b/XD.c index 6a6500c..0a0274f 100644 --- a/XD.c +++ b/XD.c @@ -287,6 +287,9 @@ main(int argc, char *argv[]) if (has_stashes(repo)) { E("The current git repo has 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)) { E("This is a new git repo.") P("B"); /* sunglasses if we're in a new repo with no HEAD */ diff --git a/config.mk b/config.mk index 9c2933e..12a7be4 100644 --- a/config.mk +++ b/config.mk @@ -1,4 +1,4 @@ -VERSION = 3.0 +VERSION = 3.2 PKG_CONFIG = pkg-config -- cgit v1.2.1