Junio C HamanoSince 33533975 ("Makefile: ask "ls-files" to list source files if available", 2011-10-18), we optionally asked "ls-files" to list the source files that ought to exist, as a faster approximation for "find" on working tree files.
This works reasonably well, except that it ends up listing the same path multiple times if the index is unmerged. Because the original use of this construct was to name files to run etags over, and the etags command happily takes the same filename multiple times without causing any harm, there was no problem (other than perhaps spending slightly more cycles, but who cares how fast the TAGS file gets updated).
We however recently added a similar call to "ls-files" to list *.h files, instead of using "find", in 92b88eba ("Makefile: use `git ls-files` to list header files, if possible", 2019-03-04). In this new use of "ls-files", the resulting list $(LIB_H) is used for, among other things, generating the header files to run hdr-check target, and the duplicate unfortunately becomes a true problem. It causes $(MAKE) to notice that there are multiple %.hco targets and complain.
Feed the resulting list to "| sort -u" before using it as a list of files to fix this.
---
* I very often have to (1) perform a merge, which conflicts, (2) manually resolve new conflicts that are yet unknown to the rerere database, (3) before running "git add", run a trial build and optionally test, and then (4) commit the result (or just say "git rerere" and then "git reset --hard").
In the step (3), we have (hopefully) good *.h files that are the result of conflict resolution in the working tree, over which we do want to run header check, but the whole point of running a trial build is to validate the result, the resolution is not yet registered to the index (or to the rerere database). These paths have multiple stages in the index, and that is when $(MAKE) complained to make me notice this buglet.
I am not fan of adding the "| sort -u" of the whole thing, because there is no need to dedup the output of the $(FIND) side of the alternative, but "(ls-files | sort -u) || (find)" would obviously not work. If we truly care, perhaps we should add a new option to ls-files to show each path only once, unless it is showing the stage number (i.e. "ls-files -s" or "ls-files -u"), but this gets the problem go away without code change, hence this RFC ;-)
Show changes to Makefile +3 −3
diff --git a/Makefile b/Makefile index 9f1b6e8926..40716c0f81 100644 --- a/Makefile +++ b/Makefile @@ -822,12 +822,12 @@ VCSSVN_LIB = vcs-svn/lib.a GENERATED_H += command-list.h -LIB_H := $(shell git ls-files '*.h' ':!t/' ':!Documentation/' 2>/dev/null || \ +LIB_H := $(shell (git ls-files '*.h' ':!t/' ':!Documentation/' 2>/dev/null || \ $(FIND) . \ -name .git -prune -o \ -name t -prune -o \ -name Documentation -prune -o \ - -name '*.h' -print) + -name '*.h' -print) | sort -u) LIB_OBJS += abspath.o LIB_OBJS += advice.o @@ -2588,7 +2588,7 @@ FIND_SOURCE_FILES = ( \ -o \( -name 'trash*' -type d -prune \) \ -o \( -name '*.[hcS]' -type f -print \) \ -o \( -name '*.sh' -type f -print \) \ - ) + | sort -u ) $(ETAGS_TARGET): FORCE $(RM) $(ETAGS_TARGET)
