Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
frama-c
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
pub
frama-c
Commits
4f408ecf
Commit
4f408ecf
authored
2 years ago
by
Patrick Baudin
Browse files
Options
Downloads
Patches
Plain Diff
A fixe for Git versions < 2.22
parent
353f065a
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
share/Makefile.headers
+2
-2
2 additions, 2 deletions
share/Makefile.headers
share/Makefile.linting
+3
-3
3 additions, 3 deletions
share/Makefile.linting
with
5 additions
and
5 deletions
share/Makefile.headers
+
2
−
2
View file @
4f408ecf
...
@@ -230,7 +230,7 @@ $(info $(HEADER.FILE_LIST))
...
@@ -230,7 +230,7 @@ $(info $(HEADER.FILE_LIST))
endif
# $(HEADER_DIFF)
endif
# $(HEADER_DIFF)
#### rules for make <headers-target>.before-push
#### 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
PHONY
:
HDRCK.checked-unmodified-ok
HDRCK.checked-unmodified-ok
:
HDRCK.checked-unmodified-ok
:
...
@@ -242,7 +242,7 @@ HDRCK.checked-unmodified-ok:
...
@@ -242,7 +242,7 @@ HDRCK.checked-unmodified-ok:
exit
1
;
\
exit
1
;
\
fi
;
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
#### rules for make <headers-target>.unstaged
## looks at unstaged files
## looks at unstaged files
...
...
This diff is collapsed.
Click to expand it.
share/Makefile.linting
+
3
−
3
View file @
4f408ecf
...
@@ -58,7 +58,7 @@
...
@@ -58,7 +58,7 @@
# - make <lint-target>.previous-commit
# - make <lint-target>.previous-commit
# looks at files of the last commit and checks that there is no staged nor unstaged files
# looks at files of the last commit and checks that there is no staged nor unstaged files
# - make <lint-target>.before-push:
# - 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-lint (removing linting targets) includes
# - make clean-utf8
# - make clean-utf8
...
@@ -230,7 +230,7 @@ $(info $(LINT.FILE_LIST))
...
@@ -230,7 +230,7 @@ $(info $(LINT.FILE_LIST))
endif
endif
#### rules for make <lint-target>.before-push
#### 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
PHONY
:
LINT.checked-unmodified-ok
LINT.checked-unmodified-ok
:
LINT.checked-unmodified-ok
:
...
@@ -242,7 +242,7 @@ LINT.checked-unmodified-ok:
...
@@ -242,7 +242,7 @@ LINT.checked-unmodified-ok:
exit
1
;
\
exit
1
;
\
fi
;
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
#### rules for make <lint-target>.unstaged
## looks at unstaged files
## looks at unstaged files
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment