[PATCH 2/4] subtree: remove support for git version <1.7

[Ævar Arnfjörð Bjarmason]

Now that git-subtree is in-tree there's no reason to be supporting
older git Versions. This reverts & amends 448e71e263 ("Use 'git merge
-Xsubtree' when git version >= 1.7.0.", 2010-05-07).

Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com>
---
 git-subtree.sh | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/git-subtree.sh b/git-subtree.sh
index d3f39a862a..1b8cd53c7f 100755
--- a/git-subtree.sh
+++ b/git-subtree.sh
@@ -810,23 +810,12 @@ cmd_merge () {
                rev="$new"
        fi
 
-       version=$(git version)
-       if test "$version" \< "git version 1.7"
+       if test -n "$message"
        then
-               if test -n "$message"
-               then
-                       git merge -s subtree --message="$message" "$rev"
-               else
-                       git merge -s subtree "$rev"
-               fi
+               git merge -Xsubtree="$prefix" \
+                       --message="$message" "$rev"
        else
-               if test -n "$message"
-               then
-                       git merge -Xsubtree="$prefix" \
-                               --message="$message" "$rev"
-               else
-                       git merge -Xsubtree="$prefix" $rev
-               fi
+               git merge -Xsubtree="$prefix" $rev
        fi
 }
 
-- 
2.17.0.290.gded63e768a