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 3d1a29ecd2079decc0602b0073c32dd4a6c7ac0e..615753c83c38f4a97752d5ca3400beeef4acd5f1 100755 (executable)
--- 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 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)
 MRT=$(git write-tree)

-CNT=1 ;# counting our head

 NON_FF_MERGE=0
 OCTOPUS_FAILURE=0
 for SHA1 in $remotes
 NON_FF_MERGE=0
 OCTOPUS_FAILURE=0
 for SHA1 in $remotes


@@ -72,9 +71,6 @@ do
                ;;
        esac
 
                ;;
        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.
        if test "$common,$NON_FF_MERGE" = "$MRC,0"
        then
                # The first head being merged was a fast-forward.