From 8b39ae44115aef8830f0d4e76378398dd2db8967 Mon Sep 17 00:00:00 2001
From: Kazuki Yamaguchi <k@rhe.jp>
Date: Sun, 15 May 2016 12:07:13 +0900
Subject: allow differ

---
 nya | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/nya b/nya
index ed215e5646..614e970618 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
-- 
cgit v1.2.3