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>
Stephen Boyd committed
Dec 11, 2009 at 16:38 UTC
f08aa017675bffe2359e0122cff2e447486b97c1
1 file changed
+1
-5
git-merge-octopus.sh
+1
-5
@@ -44,9 +44,8 @@ esac
44
# MRC is the current "merge reference commit"
45
# MRT is the current "merge result tree"
46
47
-MRC=$(git rev-parse --verify -q $head) MSG= PARENT="-p $head"
47
+MRC=$(git rev-parse --verify -q $head)
48
MRT=$(git write-tree)
49
-CNT=1 ;# counting our head
49
NON_FF_MERGE=0
50
OCTOPUS_FAILURE=0
51
for SHA1 in $remotes
@@ -72,9 +71,6 @@ do
71
;;
72
esac
73
75
- CNT=`expr $CNT + 1`
76
- PARENT="$PARENT -p $SHA1"
77
-
74
if test "$common,$NON_FF_MERGE" = "$MRC,0"
75
then
76
# The first head being merged was a fast-forward.