Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fix git-validation by always using HEAD^ #4112

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

Closed
saschagrunert wants to merge 1 commit into from
Closed

Fix git-validation by always using HEAD^ #4112

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
4 changes: 1 addition & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,9 @@ SHELLCHECK := ${BUILD_BIN_PATH}/shellcheck
ifeq ($(shell bash -c '[[ `command -v git` && `git rev-parse --git-dir 2>/dev/null` ]] && echo true'), true)
COMMIT_NO := $(shell git rev-parse HEAD 2> /dev/null || true)
GIT_TREE_STATE := $(if $(shell git status --porcelain --untracked-files=no),dirty,clean)
GIT_MERGE_BASE := $(shell git merge-base origin/master $(shell git rev-parse --abbrev-ref HEAD))
else
COMMIT_NO := unknown
GIT_TREE_STATE := unknown
GIT_MERGE_BASE := HEAD^
endif

# pass crio CLI options to generate custom configuration options at build time
Expand Down Expand Up @@ -506,7 +504,7 @@ uninstall:
git-validation: .gopathok ${GIT_VALIDATION}
GIT_CHECK_EXCLUDE="vendor" \
${GIT_VALIDATION} -v -run DCO,short-subject,dangling-whitespace \
-range ${GIT_MERGE_BASE}..HEAD
-range HEAD^..HEAD

docs-validation:
$(GO_RUN) -tags "$(BUILDTAGS)" ./test/docs-validation
Expand Down