diff mbox series

[07/30] subtree: t7900: delete some dead code

Message ID	20210423194230.1388945-8-lukeshu@lukeshu.com (mailing list archive)
State	Superseded
Headers	show Return-Path: <git-owner@kernel.org> From: Luke Shumaker <lukeshu@lukeshu.com> To: git@vger.kernel.org Cc: Avery Pennarun <apenwarr@gmail.com>, Charles Bailey <cbailey32@bloomberg.net>, Danny Lin <danny0838@gmail.com>, "David A . Greene" <greened@obbligato.org>, David Aguilar <davvid@gmail.com>, Jakub Suder <jakub.suder@gmail.com>, James Denholm <nod.helm@gmail.com>, Jeff King <peff@peff.net>, Jonathan Nieder <jrnieder@gmail.com>, Junio C Hamano <gitster@pobox.com>, =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41j?= =?utf-8?b?IER1eQ==?= <pclouds@gmail.com>, Roger L Strain <roger.strain@swri.org>, Techlive Zheng <techlivezheng@gmail.com>, Luke Shumaker <lukeshu@datawire.io> Subject: [PATCH 07/30] subtree: t7900: delete some dead code Date: Fri, 23 Apr 2021 13:42:07 -0600 Message-Id: <20210423194230.1388945-8-lukeshu@lukeshu.com> In-Reply-To: <20210423194230.1388945-1-lukeshu@lukeshu.com> References: <20210423194230.1388945-1-lukeshu@lukeshu.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	subtree: clean up, improve UX \| expand [00/30] subtree: clean up, improve UX [01/30] .gitignore: Ignore /git-subtree [02/30] subtree: t7900: update for having the default branch name be 'main' [03/30] subtree: t7900: use test-lib.sh's test_count [04/30] subtree: t7900: use consistent formatting [05/30] subtree: t7900: comment subtree_test_create_repo [06/30] subtree: t7900: use 'test' for string equality [07/30] subtree: t7900: delete some dead code [08/30] subtree: t7900: fix 'verify one file change per commit' [09/30] subtree: t7900: rename last_commit_message to last_commit_subject [10/30] subtree: t7900: add a test for the -h flag [11/30] subtree: t7900: add porcelain tests for 'pull' and 'push' [12/30] subtree: don't have loose code outside of a function [13/30] subtree: more consistent error propagation [14/30] subtree: drop support for git < 1.7 [15/30] subtree: use `git merge-base --is-ancestor` [16/30] subtree: use git-sh-setup's `say` [17/30] subtree: use more explicit variable names for cmdline args [18/30] subtree: use $* instead of $@ as appropriate [19/30] subtree: give `$(git --exec-path)` precedence over `$PATH` [20/30] subtree: use "^{commit}" instead of "^0" [21/30] subtree: parse revs in individual cmd_ functions [22/30] subtree: remove duplicate check [23/30] subtree: add comments and sanity checks [24/30] subtree: don't let debug and progress output clash [25/30] subtree: have $indent actually affect indentation [26/30] subtree: give the docs a once-over [27/30] subtree: allow --squash to be used with --rejoin [28/30] subtree: allow 'split' flags to be passed to 'push' [29/30] subtree: push: allow specifying a local rev other than HEAD [30/30] subtree: be stricter about validating flags

Commit Message

Luke Shumaker April 23, 2021, 7:42 p.m. UTC

From: Luke Shumaker <lukeshu@datawire.io>

Signed-off-by: Luke Shumaker <lukeshu@datawire.io>
---
 contrib/subtree/t/t7900-subtree.sh | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff mbox series

Patch

diff --git a/contrib/subtree/t/t7900-subtree.sh b/contrib/subtree/t/t7900-subtree.sh
index ae96c8cff5..96acd4f8be 100755
--- a/contrib/subtree/t/t7900-subtree.sh
+++ b/contrib/subtree/t/t7900-subtree.sh
@@ -10,7 +10,6 @@  and split subcommands of git subtree.
 '
 
 TEST_DIRECTORY=$(pwd)/../../../t
-export TEST_DIRECTORY
 . "$TEST_DIRECTORY"/test-lib.sh
 
 # Use our own wrapper around test-lib.sh's test_create_repo, in order
@@ -23,15 +22,6 @@  subtree_test_create_repo () {
 	git -C "$1" config log.date relative
 }
 
-create () {
-	echo "$1" >"$1" &&
-	git add "$1"
-}
-
-undo () {
-	git reset --hard HEAD~
-}
-
 # Make sure no patch changes more than one file.
 # The original set of commits changed only one file each.
 # A multi-file change would imply that we pruned commits
@@ -400,7 +390,7 @@  test_expect_success 'check hash of split' '
 		(
 			cd ./"sub proj" &&
 			subdir_hash=$(git rev-parse HEAD) &&
-			test ''"$new_hash"'' = "$subdir_hash"
+			test "$new_hash" = "$subdir_hash"
 		)
 	)
 '