[PATCH] t3501: don't create unused file

Subsystems: the rest

STALE2461d

2 messages, 2 authors, 2019-12-18 · open the first message on its own page

[PATCH] t3501: don't create unused file

From: René Scharfe <hidden>
Date: 2019-12-18 18:12:06

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 <redacted>
---
 t/t3501-revert-cherry-pick.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t3501-revert-cherry-pick.sh b/t/t3501-revert-cherry-pick.sh
index 1c51a9131d..7c1da21df1 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
 '
--
2.24.1

Re: [PATCH] t3501: don't create unused file

From: Elijah Newren <hidden>
Date: 2019-12-18 19:29:10

On Wed, Dec 18, 2019 at 10:12 AM René Scharfe [off-list ref] wrote:
quoted hunk
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 <redacted>
---
 t/t3501-revert-cherry-pick.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t3501-revert-cherry-pick.sh b/t/t3501-revert-cherry-pick.sh
index 1c51a9131d..7c1da21df1 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
 '
Thanks for cleaning this up.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help