From 4f408ecf85cd778a12072acfc5abcdfabaa687ea Mon Sep 17 00:00:00 2001
From: Patrick Baudin <patrick.baudin@cea.fr>
Date: Mon, 22 Aug 2022 09:46:49 +0200
Subject: [PATCH] A fixe for Git versions < 2.22
---
share/Makefile.headers | 4 ++--
share/Makefile.linting | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/share/Makefile.headers b/share/Makefile.headers
index 7a0c6af0ae2..65b55c39da7 100644
--- a/share/Makefile.headers
+++ b/share/Makefile.headers
@@ -230,7 +230,7 @@ $(info $(HEADER.FILE_LIST))
endif # $(HEADER_DIFF)
#### rules for make <headers-target>.before-push
-## looks at files modified from origin/$(git branch --show-current) and checks that there is no staged nor unstaged files
+## looks at files modified from origin/$(git rev-parse --abbrev-ref HEAD) and checks that there is no staged nor unstaged files
PHONY: HDRCK.checked-unmodified-ok
HDRCK.checked-unmodified-ok:
@@ -242,7 +242,7 @@ HDRCK.checked-unmodified-ok:
exit 1; \
fi;
-$(eval $(call HDRCK.file-list-filter-with-git-diff,before-push,--cached origin/$(shell git branch --show-current),HDRCK.checked-unmodified-ok))
+$(eval $(call HDRCK.file-list-filter-with-git-diff,before-push,--cached origin/$(shell git rev-parse --abbrev-ref HEAD),HDRCK.checked-unmodified-ok))
#### rules for make <headers-target>.unstaged
## looks at unstaged files
diff --git a/share/Makefile.linting b/share/Makefile.linting
index 1e987ccaf43..01588a4d27f 100644
--- a/share/Makefile.linting
+++ b/share/Makefile.linting
@@ -58,7 +58,7 @@
# - make <lint-target>.previous-commit
# looks at files of the last commit and checks that there is no staged nor unstaged files
# - make <lint-target>.before-push:
-# looks at files modified from origin/$(git branch --show-current) and checks that there is no staged nor unstaged files
+# looks at files modified from origin/$(git rev-parse --abbrev-ref HEAD) and checks that there is no staged nor unstaged files
# make clean-lint (removing linting targets) includes
# - make clean-utf8
@@ -230,7 +230,7 @@ $(info $(LINT.FILE_LIST))
endif
#### rules for make <lint-target>.before-push
-## looks at files modified from origin/$(git branch --show-current) and checks that there is no staged nor unstaged files
+## looks at files modified from origin/$(git rev-parse --abbrev-ref HEAD) and checks that there is no staged nor unstaged files
PHONY: LINT.checked-unmodified-ok
LINT.checked-unmodified-ok:
@@ -242,7 +242,7 @@ LINT.checked-unmodified-ok:
exit 1; \
fi;
-$(eval $(call LINT.file-list-filter-with-git-diff,before-push,--cached origin/$(shell git branch --show-current),LINT.checked-unmodified-ok))
+$(eval $(call LINT.file-list-filter-with-git-diff,before-push,--cached origin/$(shell git rev-parse --abbrev-ref HEAD),LINT.checked-unmodified-ok))
#### rules for make <lint-target>.unstaged
## looks at unstaged files
--
GitLab