diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-05-13 14:50:33 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-05-13 14:50:33 (GMT) |
| commit | a505f62f6f1ebdacab075f1ce52f949f33f7450f (patch) | |
| tree | 15a7b6515c534aabc322a3342d304ef5ba72c02c /Makefile | |
| parent | 8293ee0554a0b012b3e7667e419cbb33d5fee7b6 (diff) | |
| parent | 604a64641d874b0f00f1d1371f25be177972bcf2 (diff) | |
| download | git-a505f62f6f1ebdacab075f1ce52f949f33f7450f.zip git-a505f62f6f1ebdacab075f1ce52f949f33f7450f.tar.gz git-a505f62f6f1ebdacab075f1ce52f949f33f7450f.tar.bz2 | |
Merge branch 'jc/make-dedup-ls-files-output'
A "ls-files" that emulates "find" to enumerate files in the working
tree resulted in duplicated Makefile rules that caused the build to
issue an unnecessary warning during a trial build after merge
conflicts are resolved in working tree *.h files but before the
resolved results are added to the index. This has been corrected.
* jc/make-dedup-ls-files-output:
Makefile: dedup list of files obtained from ls-files
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -817,12 +817,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 := $(sort $(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)) LIB_OBJS += abspath.o LIB_OBJS += advice.o |