From 582ad80d759b6a3e0f961c532c6b498c8031fee8 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sat, 18 Jan 2014 12:10:50 +0100 Subject: [PATCH] Suppress duplicates in output of git ls-files Happens during merges; can mess up tests badly. Signed-off-by: Markus Armbruster --- Make.mk | 2 +- tests/test-common.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Make.mk b/Make.mk index 0186fa5be..c6e505044 100644 --- 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 9b68997cf..9ab3bda35 100644 --- 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() -- 2.43.0