Re: [PATCH 14/30] subtree: drop support for git < 1.7
From: Luke Shumaker <hidden>
Date: 2021-04-23 20:07:19
Subsystem:
the rest · Maintainer:
Linus Torvalds
On Fri, 23 Apr 2021 13:42:14 -0600, Luke Shumaker wrote:
"Ignore space change" is probably helpful when viewing this diff.
For mailing-list reading, the `git show -w` is: ---
diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
index 9ca498f81c..4503564f7e 100755
--- a/contrib/subtree/git-subtree.sh
+++ b/contrib/subtree/git-subtree.sh@@ -852,16 +852,6 @@ cmd_merge () { rev="$new" fi - version=$(git version) - if test "$version" \< "git version 1.7" - then - if test -n "$message" - then - git merge -s subtree --message="$message" "$rev" - else - git merge -s subtree "$rev" - fi - else if test -n "$message" then git merge -Xsubtree="$prefix" \
@@ -869,7 +859,6 @@ cmd_merge () { else git merge -Xsubtree="$prefix" $rev fi - fi } cmd_pull () {