diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-04-21 22:19:04 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-04-22 15:14:22 +0900 |
commit | 604a64641d874b0f00f1d1371f25be177972bcf2 (patch) | |
tree | 1051ae5886fd65e62c0c32014b3e5b00aa82511d /t/t4013/diff.noellipses-diff_--raw_initial | |
parent | The sixth batch (diff) | |
download | tgif-604a64641d874b0f00f1d1371f25be177972bcf2.tar.xz |
Makefile: dedup list of files obtained from ls-files
Since 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.
Let the resulting list consumed by $(sort), which deduplicates,
to fix this.
Helped-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4013/diff.noellipses-diff_--raw_initial')
0 files changed, 0 insertions, 0 deletions