Mercurial > hg

changeset 32902:642feee29d70

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: protect tests involving git ext::sh with git-ext-sh
author Sean Farley <sean@farley.io>
date Thu, 15 Jun 2017 17:14:53 -0700
parents 559db66dead5
children 27932a76a88d
files tests/test-convert-git.t tests/test-subrepo-git.t
diffstat 2 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-convert-git.t	Thu Jun 15 17:13:23 2017 -0700
+++ b/tests/test-convert-git.t	Thu Jun 15 17:14:53 2017 -0700
@@ -948,7 +948,7 @@
   $ hg convert git-repo4 git-repo4-broken-hg 2>&1 | grep 'abort:'
   abort: cannot read changes in 1c0ce3c5886f83a1d78a7b517cdff5cf9ca17bdd
 
-#if no-windows
+#if no-windows git19
 
 test for escaping the repo name (CVE-2016-3069)
 
--- a/tests/test-subrepo-git.t	Thu Jun 15 17:13:23 2017 -0700
+++ b/tests/test-subrepo-git.t	Thu Jun 15 17:14:53 2017 -0700
@@ -1137,6 +1137,8 @@
   ? s/foobar.orig
   ? s/snake.python.orig
 
+#if git19
+
 test for Git CVE-2016-3068
   $ hg init malicious-subrepository
   $ cd malicious-subrepository
@@ -1178,3 +1180,5 @@
   [255]
   $ f -Dq pwned.txt
   pwned: you asked for it
+
+#endif