Suppress duplicates in output of git ls-files

Happens during merges; can mess up tests badly.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>

diff --git a/Make.mk b/Make.mk
index 0186fa5be7a908295ff80fc86557aef213dab234..c6e505044b314d21f7a8d69a0b851478cb7009a0 100644 (file)
--- a/Make.mk
+++ b/Make.mk
@@ -46,7 +46,7 @@ all:
 
 # Source files
 ifeq ($(revctrl),git)
-src := $(shell cd $(srcdir) && git ls-files)
+src := $(shell cd $(srcdir) && git ls-files | uniq)
 else
 include $(srcdir)/sources.mk
 endif

diff --git a/tests/test-common.sh b/tests/test-common.sh
index 9b68997cf9c5b3849251d6c38f20a87644c38bf9..9ab3bda359e41ca5c6de8e2ffced8d750969844c 100644 (file)
--- a/tests/test-common.sh
+++ b/tests/test-common.sh
@@ -34,7 +34,7 @@ keep_journal 2
 GODNEWS 0
 running_test_suite 1
 EOF
-    cp `git ls-files "$srcdir"/src/lib/global | grep '\.config$'` sandbox/share/empire/builtin
+    cp `git ls-files "$srcdir"/src/lib/global | uniq | grep '\.config$'` sandbox/share/empire/builtin
 }
 
 now()
@@ -119,7 +119,7 @@ feed_files()
 
 feed_dir()
 {
-    feed_files `git ls-files "$@" | grep '/[0-9][0-9]-[^/]*$'`
+    feed_files `git ls-files "$@" | uniq | grep '/[0-9][0-9]-[^/]*$'`
 }
 
 begin_test()