blob: 898a0c0e2075a03fd5a27a863228141ceb821539 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
|
#! /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
|
