mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dl/honor-cflags-in-hdr-check'

Browse Source 
Dev support.

* dl/honor-cflags-in-hdr-check:
  ci: run `hdr-check` as part of the `Static Analysis` job
  Makefile: emulate compile in $(HCO) target better
  pack-bitmap.h: remove magic number
  promisor-remote.h: include missing header
  apply.h: include missing header
This commit is contained in:
Junio C Hamano 2019-10-07 11:33:02 +09:00
commit 9728ab488a
8 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -216,6 +216,7 @@
/tags /tags
/TAGS /TAGS
/cscope* /cscope*
*.hcc
*.obj *.obj
*.lib *.lib
*.res *.res

12
Makefile
View File

@ -1888,7 +1888,7 @@ ifndef V
QUIET_MSGFMT = @echo ' ' MSGFMT $@; QUIET_MSGFMT = @echo ' ' MSGFMT $@;
QUIET_GCOV = @echo ' ' GCOV $@; QUIET_GCOV = @echo ' ' GCOV $@;
QUIET_SP = @echo ' ' SP $<; QUIET_SP = @echo ' ' SP $<;
QUIET_HDR = @echo ' ' HDR $<; QUIET_HDR = @echo ' ' HDR $(<:hcc=h);
QUIET_RC = @echo ' ' RC $@; QUIET_RC = @echo ' ' RC $@;
QUIET_SUBDIR0 = +@subdir= QUIET_SUBDIR0 = +@subdir=
QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \ QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \
@ -2788,9 +2788,14 @@ ifndef GCRYPT_SHA256
endif endif
CHK_HDRS = $(filter-out $(EXCEPT_HDRS),$(LIB_H)) CHK_HDRS = $(filter-out $(EXCEPT_HDRS),$(LIB_H))
HCO = $(patsubst %.h,%.hco,$(CHK_HDRS)) HCO = $(patsubst %.h,%.hco,$(CHK_HDRS))
HCC = $(HCO:hco=hcc)
$(HCO): %.hco: %.h FORCE %.hcc: %.h
$(QUIET_HDR)$(CC) -include git-compat-util.h -I. -o /dev/null -c -xc $< @echo '#include "git-compat-util.h"' >$@
@echo '#include "$<"' >>$@
$(HCO): %.hco: %.hcc FORCE
$(QUIET_HDR)$(CC) $(ALL_CFLAGS) -o /dev/null -c -xc $<
.PHONY: hdr-check $(HCO) .PHONY: hdr-check $(HCO)
hdr-check: $(HCO) hdr-check: $(HCO)
@ -3095,6 +3100,7 @@ clean: profile-clean coverage-clean cocciclean
$(RM) $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) git$X $(RM) $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) git$X
$(RM) $(TEST_PROGRAMS) $(RM) $(TEST_PROGRAMS)
$(RM) $(FUZZ_PROGRAMS) $(RM) $(FUZZ_PROGRAMS)
$(RM) $(HCC)
$(RM) -r bin-wrappers $(dep_dirs) $(RM) -r bin-wrappers $(dep_dirs)
$(RM) -r po/build/ $(RM) -r po/build/
$(RM) *.pyc *.pyo */*.pyc */*.pyo command-list.h $(ETAGS_TARGET) tags cscope* $(RM) *.pyc *.pyo */*.pyc */*.pyo command-list.h $(ETAGS_TARGET) tags cscope*

1
apply.h
View File

@ -1,6 +1,7 @@
#ifndef APPLY_H #ifndef APPLY_H
#define APPLY_H #define APPLY_H
#include "hash.h"
#include "lockfile.h" #include "lockfile.h"
#include "string-list.h" #include "string-list.h"

2
azure-pipelines.yml
View File

@ -354,7 +354,7 @@ jobs:
test "$GITFILESHAREPWD" = '$(gitfileshare.pwd)' || ci/mount-fileshare.sh //gitfileshare.file.core.windows.net/test-cache gitfileshare "$GITFILESHAREPWD" "$HOME/test-cache" || exit 1 test "$GITFILESHAREPWD" = '$(gitfileshare.pwd)' || ci/mount-fileshare.sh //gitfileshare.file.core.windows.net/test-cache gitfileshare "$GITFILESHAREPWD" "$HOME/test-cache" || exit 1
sudo apt-get update && sudo apt-get update &&
sudo apt-get install -y coccinelle && sudo apt-get install -y coccinelle libcurl4-openssl-dev libssl-dev libexpat-dev gettext &&
export jobname=StaticAnalysis && export jobname=StaticAnalysis &&

3
ci/install-dependencies.sh
View File

@ -49,7 +49,8 @@ osx-clang|osx-gcc)
;; ;;
StaticAnalysis) StaticAnalysis)
sudo apt-get -q update sudo apt-get -q update
sudo apt-get -q -y install coccinelle sudo apt-get -q -y install coccinelle libcurl4-openssl-dev libssl-dev \
libexpat-dev gettext
;; ;;
Documentation) Documentation)
sudo apt-get -q update sudo apt-get -q update

3
ci/run-static-analysis.sh
View File

@ -26,4 +26,7 @@ then
exit 1 exit 1
fi fi
make hdr-check ||
exit 1
save_good_tree save_good_tree

6
pack-bitmap.h
View File

@ -9,16 +9,16 @@ struct commit;
struct repository; struct repository;
struct rev_info; struct rev_info;
static const char BITMAP_IDX_SIGNATURE[] = {'B', 'I', 'T', 'M'};
struct bitmap_disk_header { struct bitmap_disk_header {
char magic[4]; char magic[ARRAY_SIZE(BITMAP_IDX_SIGNATURE)];
uint16_t version; uint16_t version;
uint16_t options; uint16_t options;
uint32_t entry_count; uint32_t entry_count;
unsigned char checksum[GIT_MAX_RAWSZ]; unsigned char checksum[GIT_MAX_RAWSZ];
}; };
static const char BITMAP_IDX_SIGNATURE[] = {'B', 'I', 'T', 'M'};
#define NEEDS_BITMAP (1u<<22) #define NEEDS_BITMAP (1u<<22)
enum pack_bitmap_opts { enum pack_bitmap_opts {

2
promisor-remote.h
View File

@ -1,6 +1,8 @@
#ifndef PROMISOR_REMOTE_H #ifndef PROMISOR_REMOTE_H
#define PROMISOR_REMOTE_H #define PROMISOR_REMOTE_H
#include "repository.h"
struct object_id; struct object_id;
/* /*