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
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
|
#!/usr/bin/env bash
#==========================================================================
#
# Copyright Insight Software Consortium
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0.txt
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
#==========================================================================
die() {
echo 'gerrit-merge failure' 1>&2
echo '--------------------' 1>&2
echo '' 1>&2
echo "$@" 1>&2
exit 1
}
# Identify and validate the topic branch name.
head="$(git symbolic-ref HEAD)" && topic="${head#refs/heads/}" || topic=''
if test -z "$topic" -o "$topic" = "master"; then
die 'Please name your topic:
git checkout -b descriptive-name'
fi
# Do not merge until it has been sent up to Gerrit for review.
gerrit_remote=$(git config remote.gerrit.url)
gerrit_push_url=$(git config remote.gerrit.pushurl)
if test -n "$gerrit_push_url"; then
gerrit_url=$(echo $gerrit_push_url | cut -d ':' -f 1)
gerrit_project=$(echo $gerrit_push_url | cut -d ':' -f 2)
elif test -n "$gerrit_remote"; then
gerrit_url=$(echo $gerrit_remote | cut -d ':' -f 1)
gerrit_project=$(echo $gerrit_remote | cut -d ':' -f 2)
else
die "Git remote not set."
fi
ssh $gerrit_url gerrit ls-projects >/dev/null || die "Could not connect to Gerrit."
head_sha=$(git rev-parse HEAD)
commit_count=$(ssh $gerrit_url gerrit query -- commit:$head_sha | awk '/rowCount/ { print $2 }')
if test "$commit_count" -lt 1; then
read -ep "Are you sure you want to merge '$topic' to ITK master? [N/y]: " merge_it
if test "$merge_it" != "y" -a "$merge_it" != "Y"; then
die "Merge cancelled."
fi
fi
git stage-push && git stage-merge
|
