Skip to content

Commit f08aa01

Browse files
bebarinogitster
authored andcommitted
octopus: remove dead code
MSG, PARENT, and CNT are never used, just assigned to. Signed-off-by: Stephen Boyd <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 85bf49f commit f08aa01

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

git-merge-octopus.sh

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,8 @@ esac
4444
# MRC is the current "merge reference commit"
4545
# MRT is the current "merge result tree"
4646

47-
MRC=$(git rev-parse --verify -q $head) MSG= PARENT="-p $head"
47+
MRC=$(git rev-parse --verify -q $head)
4848
MRT=$(git write-tree)
49-
CNT=1 ;# counting our head
5049
NON_FF_MERGE=0
5150
OCTOPUS_FAILURE=0
5251
for SHA1 in $remotes
@@ -72,9 +71,6 @@ do
7271
;;
7372
esac
7473

75-
CNT=`expr $CNT + 1`
76-
PARENT="$PARENT -p $SHA1"
77-
7874
if test "$common,$NON_FF_MERGE" = "$MRC,0"
7975
then
8076
# The first head being merged was a fast-forward.

0 commit comments

Comments
 (0)