* [PATCH] t3501: don't create unused file
@ 2019-12-18 18:12 René Scharfe
2019-12-18 19:28 ` Elijah Newren
0 siblings, 1 reply; 2+ messages in thread
From: René Scharfe @ 2019-12-18 18:12 UTC (permalink / raw)
To: Git Mailing List; +Cc: Junio C Hamano, Elijah Newren
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
'
--
2.24.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] t3501: don't create unused file
2019-12-18 18:12 [PATCH] t3501: don't create unused file René Scharfe
@ 2019-12-18 19:28 ` Elijah Newren
0 siblings, 0 replies; 2+ messages in thread
From: Elijah Newren @ 2019-12-18 19:28 UTC (permalink / raw)
To: René Scharfe; +Cc: Git Mailing List, Junio C Hamano
On Wed, Dec 18, 2019 at 10:12 AM René Scharfe <l.s.r@web.de> wrote:
>
> 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.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-12-18 19:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-12-18 18:12 [PATCH] t3501: don't create unused file René Scharfe
2019-12-18 19:28 ` Elijah Newren
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.