MonetDB: copyintobinary - Merge 'default' into 'copyintobinary'

[Joeri van Ruth]

Changeset: 86354488a5e4 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/86354488a5e4
Branch: copyintobinary
Log Message:

Merge 'default' into 'copyintobinary'


diffs (14 lines):

diff --git a/buildtools/conf/Maddlog b/buildtools/conf/Maddlog
--- a/buildtools/conf/Maddlog
+++ b/buildtools/conf/Maddlog
@@ -74,10 +74,6 @@ vcs_current_branch() {
     if [[ "$vcs_kind" == "hg" ]] ; then
         tag=$(hg branch)
     else
-        if [[ ! -d "$root_dir/.git" ]] ; then
-            echo "Cannot use this script in a git worktree" >&2
-            exit 2
-        fi
         tag=$(git rev-parse --abbrev-ref HEAD)
         tag=${tag#branches/}
         if [[ "$tag" == "master" ]] ; then
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org