[commit: ghc] wip/T8545: Add check for left-over testsuite/.git folder to sync-all (1be87e5)
git at git.haskell.org
git at git.haskell.org
Tue Dec 10 10:09:26 UTC 2013
Repository : ssh://git@git.haskell.org/ghc
On branch : wip/T8545
Link : http://ghc.haskell.org/trac/ghc/changeset/1be87e5ecca4adc79e0de3bab7130950c83dbb63/ghc
>---------------------------------------------------------------
commit 1be87e5ecca4adc79e0de3bab7130950c83dbb63
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date: Tue Dec 10 11:06:03 2013 +0100
Add check for left-over testsuite/.git folder to sync-all
This way, the first time sync-all is called after updating to a
post-testsuite-merge (see #8545) state of ghc.git, the sync-all script
aborts with an error message if a testsuite/.git folder is detected and
thus forces the user to take action.
Signed-off-by: Herbert Valerio Riedel <hvr at gnu.org>
>---------------------------------------------------------------
1be87e5ecca4adc79e0de3bab7130950c83dbb63
sync-all | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/sync-all b/sync-all
index 3fe0e8c..f88ad2b 100755
--- a/sync-all
+++ b/sync-all
@@ -933,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 {
More information about the ghc-commits
mailing list