From: Luke Shumaker <lukeshu@datawire.io>
Date: Tue, 27 Apr 2021 21:17:40 +0000 (-0600)
Subject: subtree: remove duplicate check
X-Git-Tag: v2.32.0-rc0~30^2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cbb5de8b83f3abde8f9b37b0048bc00344b6709b;p=thirdparty%2Fgit.git

subtree: remove duplicate check

`cmd_add` starts with a check that the directory doesn't yet exist.
However, the `main` function performs the exact same check before
calling `cmd_add`.  So remove the check from `cmd_add`.

Signed-off-by: Luke Shumaker <lukeshu@datawire.io>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
index 0df8d1b7d4..7fbd8481ed 100755
--- a/contrib/subtree/git-subtree.sh
+++ b/contrib/subtree/git-subtree.sh
@@ -655,10 +655,6 @@ process_split_commit () {
 }
 
 cmd_add () {
-	if test -e "$dir"
-	then
-		die "'$dir' already exists.  Cannot add."
-	fi
 
 	ensure_clean