From d091725b9af5057d0ff85fb84bb792450b4a1f92 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 12 Jun 2015 17:01:33 +0200
Subject: Remove git scripts, they are now in separate repository

---
 git/merge.sh | 43 -------------------------------------------
 1 file changed, 43 deletions(-)
 delete mode 100755 git/merge.sh

(limited to 'git/merge.sh')

diff --git a/git/merge.sh b/git/merge.sh
deleted file mode 100755
index 898a0c0..0000000
--- a/git/merge.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#! /bin/sh
-
-# Assume this script never run via PATH.
-#
-self=`realpath $0`
-. `dirname $self`/modules
-
-wd=`pwd`
-
-if [ "$1" = "" ]; then
-  echo "source branch name expected" 1>&2
-  exit 1
-fi
-
-for i in $modules; do
-  echo "merge $i" 1>&2
-  cd $i
-
-  br=`git symbolic-ref -q HEAD`
-  br=`echo $br | sed -e 's%^refs/heads/%%'`
-
-  # Only allow fast-forward merges into master.
-  #
-  if [ "$br" = "master" ]; then
-    git merge --ff-only $*
-  else
-    git merge $*
-  fi
-
-  if [ $? -ne 0 ]; then
-    echo                1>&2
-    echo "merge FAILED" 1>&2
-    echo                1>&2
-
-    # Merge failures (conflicts) into non-master branches are ok.
-    #
-    if [ "$br" = "master" ]; then
-      exit 1
-    fi
-  fi
-
-  cd $wd
-done
-- 
cgit v1.1