Skip to content

Commit 7a42231

Browse files
committed
Use Dir instead of ls -al
1 parent 67db5a7 commit 7a42231

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

spec/integration/resolving_cherry_pick_conflict_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242

4343
it 'does not remove the CHERRY_PICK_HEAD file' do
4444
subject
45-
`ls -al .git`.should include 'CHERRY_PICK_HEAD'
45+
Dir['.git/*'].should include '.git/CHERRY_PICK_HEAD'
4646
end
4747

4848
it 'keeps the commit message from the cherry-picked commit' do

0 commit comments

Comments
 (0)