Skip to content

Commit

Permalink
octopus: remove dead code
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
bebarino authored and gitster committed Dec 14, 2009
1 parent 85bf49f commit f08aa01
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions git-merge-octopus.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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.
Expand Down

0 comments on commit f08aa01

Please sign in to comment.