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>
This commit is contained in:
parent
8c02fe6060
commit
f670adb49b
@ -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
|
||||
'
|
||||
|
Loading…
Reference in New Issue
Block a user