diff --git a/tests/test-grep.t b/tests/test-grep.t
--- a/tests/test-grep.t
+++ b/tests/test-grep.t
@@ -670,6 +670,11 @@
   $ rm -f added; ln -s symlink-added added
   $ hg grep '' | grep added
   added:symlink-added
+  $ mkdir dir; touch dir/f; hg add dir/f
+  $ rm -rf dir; ln -s / dir
+  $ hg grep ''
+  abort: path 'dir/f' traverses symbolic link 'dir'
+  [255]
 #endif
 
 which can be overridden by -rREV