threads / patch / 52483

patcht3501: don't create unused file

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

## tl;dr

2 messages between Dec 18, 2019 and Dec 18, 2019. Diffs are folded; open one to read it.

replies: 1people: 2as markdown or json

René Scharfe· Dec 18, 2019, 18:12 UTC · lore

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>
---
 t/t3501-revert-cherry-pick.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Show changes to t/t3501-revert-cherry-pick.sh +1 −2

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

Elijah Newren· Dec 18, 2019, 19:28 UTC · re: René Scharfe · lore

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

On Wed, Dec 18, 2019 at 10:12 AM René Scharfe <l.s.r@web.de> wrote:

Show 22 quoted lines

>
> 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>
> ---
>  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.