diff options
| author | Stephen Boyd <bebarino@gmail.com> | 2009-12-11 16:38:59 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-12-13 23:40:24 -0800 |
| commit | f08aa017675bffe2359e0122cff2e447486b97c1 (patch) | |
| tree | 501dcb88e132278467cdf3685f385ef961646ced /git-merge-octopus.sh | |
| parent | 85bf49f9a55fd9ded396460d245a55b651d7bdaa (diff) | |
| download | git-f08aa017675bffe2359e0122cff2e447486b97c1.tar.gz | |
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>
Diffstat (limited to 'git-merge-octopus.sh')
| -rwxr-xr-x | git-merge-octopus.sh | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/git-merge-octopus.sh b/git-merge-octopus.sh index 3d1a29ecd2..615753c83c 100755 --- a/git-merge-octopus.sh +++ b/git-merge-octopus.sh @@ -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 ;; 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. |