]> git.ipfire.org Git - thirdparty/git.git/commitdiff
t3501: don't create unused file
authorRené Scharfe <l.s.r@web.de>
Wed, 18 Dec 2019 18:12:00 +0000 (19:12 +0100)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Dec 2019 20:32:24 +0000 (12:32 -0800)
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>
t/t3501-revert-cherry-pick.sh

index d1c68af8c50e75255baa618ea297549b548c0fc2..3470e45d5d08fd7b2c768ef0d7f5ba6c4e60ac6b 100755 (executable)
@@ -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
 '