kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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 2009-12-11 16:38:59 -08:00 committed by Junio C Hamano
parent 85bf49f9a5
commit f08aa01767
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
git-merge-octopus.sh
View File

@ -44,9 +44,8 @@ esac
# MRC is the current "merge reference commit" # MRC is the current "merge reference commit"
# MRT is the current "merge result tree" # 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 NON_FF_MERGE=0
OCTOPUS_FAILURE=0 OCTOPUS_FAILURE=0
for SHA1 in $remotes 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" if test "$common,$NON_FF_MERGE" = "$MRC,0"
then then
# The first head being merged was a fast-forward. # The first head being merged was a fast-forward.