aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKazuki Yamaguchi <k@rhe.jp>2016-05-15 12:07:13 +0900
committerKazuki Yamaguchi <k@rhe.jp>2016-05-15 12:07:13 +0900
commit8b39ae44115aef8830f0d4e76378398dd2db8967 (patch)
tree4319d12495f0aacd7cec603b34f545102c049568
parent56b46b79a7becee1090b52ef8f6326ba97cfcd84 (diff)
downloadruby-rhe-tools.tar.gz
allow differrhe-tools
-rwxr-xr-xnya8
1 files changed, 0 insertions, 8 deletions
diff --git a/nya b/nya
index ed215e5..614e970 100755
--- a/nya
+++ b/nya
@@ -27,14 +27,6 @@ git reset --hard upstream/trunk
git fetch origin --progress
git merge --no-edit --no-ff rhe-tools || exit 2
while list_branches && echo -n "> " && read line; do
- if ORIGIN_HEAD=$(git rev-parse "origin/$line"); then
- LOCAL_HEAD=$(git rev-parse "$line")
- if [ "x$LOCAL_HEAD" != "x$ORIGIN_HEAD" ]; then
- echo "origin and local differs?"
- exit 1
- fi
- fi
-
echo "merging branch $line"
while :; do
if git merge --no-edit --no-ff "$line"; then