Browse Source

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>
maint
Stephen Boyd 15 years ago committed by Junio C Hamano
parent
commit
f08aa01767
  1. 6
      git-merge-octopus.sh

6
git-merge-octopus.sh

@ -44,9 +44,8 @@ esac @@ -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 @@ -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.

Loading…
Cancel
Save