[PATCH 14/30] subtree: drop support for git < 1.7
- From
Luke Shumaker <lukeshu@lukeshu.com>
- Date
- Apr 23, 2021, 19:42 UTC
- Message-ID
- <20210423194230.1388945-15-lukeshu@lukeshu.com>
- In-Reply-To
- <20210423194230.1388945-1-lukeshu@lukeshu.com>
From: Luke Shumaker <lukeshu@datawire.io>
That was nice to have when git-subtree lived out-of-tree. But now that it lives in git.git, it's not nescessary to keep around.
"Ignore space change" is probably helpful when viewing this diff.
Signed-off-by: Luke Shumaker <lukeshu@datawire.io> --- contrib/subtree/git-subtree.sh | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-)
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,23 +852,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.31.1