[PATCH 3/3] octopus: remove dead code
From: Stephen Boyd <hidden>
Date: 2016-06-15 22:47:54
Subsystem:
the rest · Maintainer:
Linus Torvalds
MSG, PARENT, and CNT are never used, just assigned to. Signed-off-by: Stephen Boyd <redacted> --- I don't know if this is wanted. Looks like maybe they're used as simple debug aides? 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 99b6f8a..3cb0b31 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.
--
1.6.6.rc1.45.g9aadbb