summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorCraig Topper <craig.topper@gmail.com>2013-07-03 14:48:37 +0000
committerCraig Topper <craig.topper@gmail.com>2013-07-03 14:48:37 +0000
commitbf361f58df152df70972fe1e212dc83880463f01 (patch)
tree849eea280b086d583d1232b5e5474efd3512f3f2 /Makefile
parentd55ef5ce5f92fc02063e65ef328b89a7d66a3636 (diff)
Fix regular expression used by 'make update' to only look for 'I' and '?' at the start of svn info results and to check for spaces after 'I' instead of just after '?'.
Previously it was able to match 'I' anywhere in the filenames of the svn info results instead of just files that where ignored or unknown to svn. This would cause 'make update' to infinitely recurse if a file was modified with I anywhere in its name since svn info would return a Path pointing to the llvm root for those files. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@185539 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 7a1b1904594..fee675d3f26 100644
--- a/Makefile
+++ b/Makefile
@@ -253,7 +253,7 @@ AWK = awk
# a given path. svnup() requires one argument: the root to search from.
define SUB_SVN_DIRS
svnup() {
- dirs=`svn status --no-ignore $$1 | awk '/I|\? / {print $$2}' | LC_ALL=C xargs svn info 2>/dev/null | awk '/^Path:\ / {print $$2}'`;
+ dirs=`svn status --no-ignore $$1 | awk '/^(I|\?) / {print $$2}' | LC_ALL=C xargs svn info 2>/dev/null | awk '/^Path:\ / {print $$2}'`;
if [ "$$dirs" = "" ]; then
return;
fi;