diff options
| author |  René Scharfe <l.s.r@web.de> | 2019-12-18 19:12:00 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-12-18 12:32:24 -0800 |
| commit | f670adb49bd6762ec497fe612e29a51dbe3fcbed (patch) | |
| tree | 6dd36e19e7c57382dae8d92899aa274efbc265d7 /t | |
| parent | t7004: don't create unused file (diff) | |
| download | tgif-f670adb49bd6762ec497fe612e29a51dbe3fcbed.tar.xz | |
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>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3501-revert-cherry-pick.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3501-revert-cherry-pick.sh b/t/t3501-revert-cherry-pick.sh index d1c68af8c5..3470e45d5d 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 ' |