From: Stephen Boyd <bebarino@gmail.com>
Date: Sat, 12 Dec 2009 00:38:59 +0000 (-0800)
Subject: octopus: remove dead code
X-Git-Tag: v1.6.6.1~2^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f08aa017675bffe2359e0122cff2e447486b97c1;p=git-core%2Fgit.git

octopus: remove dead code

MSG, PARENT, and CNT are never used, just assigned to.

Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git-merge-octopus.sh b/git-merge-octopus.sh
index 3d1a29ecd..615753c83 100755
--- a/git-merge-octopus.sh
+++ b/git-merge-octopus.sh
@@ -44,9 +44,8 @@ esac
 # MRC is the current "merge reference commit"
 # MRT is the current "merge result tree"
 
-MRC=$(git rev-parse --verify -q $head) MSG= PARENT="-p $head"
+MRC=$(git rev-parse --verify -q $head)
 MRT=$(git write-tree)
-CNT=1 ;# counting our head
 NON_FF_MERGE=0
 OCTOPUS_FAILURE=0
 for SHA1 in $remotes
@@ -72,9 +71,6 @@ do
 		;;
 	esac
 
-	CNT=`expr $CNT + 1`
-	PARENT="$PARENT -p $SHA1"
-
 	if test "$common,$NON_FF_MERGE" = "$MRC,0"
 	then
 		# The first head being merged was a fast-forward.