diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-12-25 22:22:01 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-12-25 22:22:01 +0300 |
| commit | 8be0a428d65e48f42e4600ab0fc91109777d85e1 (patch) | |
| tree | 160da2115827a91cb4a2dd88dc8424d2a04e4b7b /t/t3501-revert-cherry-pick.sh | |
| parent | 65099bd7752362df440571881d4a2825c7cd8d5d (diff) | |
| parent | 675ef6bab807fd94773870db8a1e70447b60a61b (diff) | |
Merge branch 'rs/test-cleanup'
Test cleanup.
* rs/test-cleanup:
t6030: don't create unused file
t5580: don't create unused file
t3501: don't create unused file
t7004: don't create unused file
t4256: don't create unused file
Diffstat (limited to 't/t3501-revert-cherry-pick.sh')
| -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 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 ' |