From: René Scharfe <l.s.r@web.de>
Date: Wed, 18 Dec 2019 18:12:00 +0000 (+0100)
Subject: t3501: don't create unused file
X-Git-Tag: v2.25.0-rc0~2^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f670adb49bd6762ec497fe612e29a51dbe3fcbed;p=thirdparty%2Fgit.git

t3501: don't create unused file

The file "out" became unused with fd53b7ffd1 (merge-recursive: improve
add_cacheinfo error handling, 2018-04-19); get rid of it.

Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/t/t3501-revert-cherry-pick.sh b/t/t3501-revert-cherry-pick.sh
index d1c68af8c5..3470e45d5d 100755
--- a/t/t3501-revert-cherry-pick.sh
+++ b/t/t3501-revert-cherry-pick.sh
@@ -150,7 +150,7 @@ test_expect_success 'cherry-pick works with dirty renamed file' '
 	test_tick &&
 	git commit -m renamed &&
 	echo modified >renamed &&
-	git cherry-pick refs/heads/unrelated >out &&
+	git cherry-pick refs/heads/unrelated &&
 	test $(git rev-parse :0:renamed) = $(git rev-parse HEAD~2:to-rename.t) &&
 	grep -q "^modified$" renamed
 '