summaryrefslogtreecommitdiff
path: root/sync-all
diff options
context:
space:
mode:
Diffstat (limited to 'sync-all')
-rwxr-xr-xsync-all24
1 files changed, 19 insertions, 5 deletions
diff --git a/sync-all b/sync-all
index 38a840d533..f88ad2b85b 100755
--- a/sync-all
+++ b/sync-all
@@ -639,9 +639,9 @@ get
before "get" that enable extra repositories. The full list is
given at the end of this help. For example:
- ./sync-all --testsuite get
+ ./sync-all --nofib get
- would get the testsuite repository in addition to the usual set of
+ would get the nofib repository in addition to the usual set of
subrepositories.
remote add <remote-name>
@@ -726,8 +726,6 @@ Flags given *after* the command are passed to git.
--nofib also clones the nofib benchmark suite
- --testsuite also clones the ghc testsuite
-
--extra also clone some extra library packages
--no-dph avoids cloning the dph packages
@@ -867,7 +865,7 @@ sub main {
if ($bare_flag && ! $bare_found && ! $defaultrepo) {
die "error: bare repository ghc.git not found.\n"
. " Either clone a bare ghc repo first or specify the repo location. E.g.:\n"
- . " ./sync-all --bare [--testsuite --nofib --extra] -r http://git.haskell.org get\n"
+ . " ./sync-all --bare [--nofib --extra] -r http://git.haskell.org get\n"
}
elsif ($bare_found) {
$bare_flag = "--bare";
@@ -935,6 +933,22 @@ BEGIN {
checkCurrentBranchIsMaster();
}
$initial_working_directory = getcwd();
+
+ #message "== Checking for left-over testsuite/.git folder";
+ if (-d "testsuite/.git") {
+ print <<EOF;
+============================
+ATTENTION!
+
+You have a left-over testsuite/.git folder in your GHC tree!
+
+Please backup or remove it (e.g. "rm -r testsuite/.git") before
+proceeding as the testsuite Git repository is now tracked as part of
+the ghc Git repository (see #8545 for more details)
+============================
+EOF
+ die "detected obsolete testsuite/.git folder"
+ }
}
END {