diff -Nru rust-ripgrep-12.1.0/build.rs rust-ripgrep-12.1.1/build.rs
--- rust-ripgrep-12.1.0/build.rs	2020-05-09 03:36:05.000000000 +0000
+++ rust-ripgrep-12.1.1/build.rs	2020-05-20 01:10:08.000000000 +0000
@@ -217,6 +217,10 @@
         .doc_long
         .replace("{", "{")
         .replace("}", r"}")
+        // Hack to render ** literally in man page correctly. We can't put
+        // these crazy +++ in the help text directly, since that shows
+        // literally in --help output.
+        .replace("*-g 'foo/**'*", "*-g +++'foo/**'+++*")
         .split("\n\n")
         .map(|s| s.to_string())
         .collect();
diff -Nru rust-ripgrep-12.1.0/Cargo.lock rust-ripgrep-12.1.1/Cargo.lock
--- rust-ripgrep-12.1.0/Cargo.lock	2020-05-09 15:39:15.000000000 +0000
+++ rust-ripgrep-12.1.1/Cargo.lock	2020-05-29 13:53:06.000000000 +0000
@@ -13,8 +13,8 @@
 version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "hermit-abi 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hermit-abi 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -35,7 +35,7 @@
 
 [[package]]
 name = "bstr"
-version = "0.2.12"
+version = "0.2.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -55,7 +55,7 @@
 
 [[package]]
 name = "cc"
-version = "1.0.52"
+version = "1.0.54"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -65,7 +65,7 @@
 
 [[package]]
 name = "clap"
-version = "2.33.0"
+version = "2.33.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -86,7 +86,7 @@
 
 [[package]]
 name = "encoding_rs"
-version = "0.8.22"
+version = "0.8.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -98,12 +98,12 @@
 version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "encoding_rs 0.8.22 (registry+https://github.com/rust-lang/crates.io-index)",
+ "encoding_rs 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "fnv"
-version = "1.0.6"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -117,18 +117,18 @@
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "aho-corasick 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "bstr 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bstr 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fnv 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 1.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "grep"
-version = "0.2.6"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "grep-cli 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "grep-cli 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "grep-matcher 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "grep-pcre2 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "grep-printer 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -138,15 +138,15 @@
 
 [[package]]
 name = "grep-cli"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "bstr 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bstr 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "globset 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 1.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "same-file 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "termcolor 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi-util 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -175,12 +175,12 @@
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "base64 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "bstr 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bstr 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "grep-matcher 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "grep-searcher 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.107 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.107 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.52 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.110 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.110 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.53 (registry+https://github.com/rust-lang/crates.io-index)",
  "termcolor 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -190,11 +190,11 @@
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "aho-corasick 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "bstr 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bstr 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "grep-matcher 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 1.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex-syntax 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex-syntax 0.6.18 (registry+https://github.com/rust-lang/crates.io-index)",
  "thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -203,9 +203,9 @@
 version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bstr 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bstr 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "bytecount 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "encoding_rs 0.8.22 (registry+https://github.com/rust-lang/crates.io-index)",
+ "encoding_rs 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)",
  "encoding_rs_io 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "grep-matcher 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -214,15 +214,15 @@
 
 [[package]]
 name = "hermit-abi"
-version = "0.1.12"
+version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "ignore"
-version = "0.4.15"
+version = "0.4.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "crossbeam-utils 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -230,7 +230,7 @@
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 1.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "same-file 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "walkdir 2.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -247,9 +247,9 @@
 version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cc 1.0.52 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.54 (registry+https://github.com/rust-lang/crates.io-index)",
  "fs_extra 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -258,7 +258,7 @@
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "jemalloc-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -268,7 +268,7 @@
 
 [[package]]
 name = "libc"
-version = "0.2.69"
+version = "0.2.71"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -289,7 +289,7 @@
 version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -298,8 +298,8 @@
 version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "hermit-abi 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hermit-abi 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -315,7 +315,7 @@
 version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "pcre2-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -326,8 +326,8 @@
 version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cc 1.0.52 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.54 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
  "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -338,7 +338,7 @@
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.12"
+version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -346,20 +346,20 @@
 
 [[package]]
 name = "quote"
-version = "1.0.4"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 1.0.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "regex"
-version = "1.3.7"
+version = "1.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "aho-corasick 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex-syntax 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex-syntax 0.6.18 (registry+https://github.com/rust-lang/crates.io-index)",
  "thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -373,25 +373,25 @@
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.17"
+version = "0.6.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "ripgrep"
-version = "12.1.0"
+version = "12.1.1"
 dependencies = [
- "bstr 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "grep 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "ignore 0.4.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bstr 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "clap 2.33.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "grep 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ignore 0.4.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "jemallocator 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "num_cpus 1.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 1.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.107 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.107 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.52 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.110 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.110 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.53 (registry+https://github.com/rust-lang/crates.io-index)",
  "termcolor 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "walkdir 2.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -411,27 +411,27 @@
 
 [[package]]
 name = "serde"
-version = "1.0.107"
+version = "1.0.110"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "serde_derive"
-version = "1.0.107"
+version = "1.0.110"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 1.0.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.52"
+version = "1.0.53"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "itoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "ryu 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.107 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.110 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -441,11 +441,11 @@
 
 [[package]]
 name = "syn"
-version = "1.0.19"
+version = "1.0.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 1.0.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -526,32 +526,32 @@
 "checksum autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
 "checksum base64 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "53d1ccbaf7d9ec9537465a97bf19edc1a4e158ecb49fc16178202238c569cc42"
 "checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
-"checksum bstr 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)" = "2889e6d50f394968c8bf4240dc3f2a7eb4680844d27308f798229ac9d4725f41"
+"checksum bstr 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "31accafdb70df7871592c058eca3985b71104e15ac32f64706022c58867da931"
 "checksum bytecount 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b0017894339f586ccb943b01b9555de56770c11cda818e7e3d8bd93f4ed7f46e"
 "checksum byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de"
-"checksum cc 1.0.52 (registry+https://github.com/rust-lang/crates.io-index)" = "c3d87b23d6a92cd03af510a5ade527033f6aa6fa92161e2d5863a907d4c5e31d"
+"checksum cc 1.0.54 (registry+https://github.com/rust-lang/crates.io-index)" = "7bbb73db36c1246e9034e307d0fba23f9a2e251faa47ade70c1bd252220c8311"
 "checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9"
+"checksum clap 2.33.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bdfa80d47f954d53a35a64987ca1422f495b8d6483c0fe9f7117b36c2a792129"
 "checksum crossbeam-utils 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
-"checksum encoding_rs 0.8.22 (registry+https://github.com/rust-lang/crates.io-index)" = "cd8d03faa7fe0c1431609dfad7bbe827af30f82e1e2ae6f7ee4fca6bd764bc28"
+"checksum encoding_rs 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)" = "e8ac63f94732332f44fe654443c46f6375d1939684c17b0afb6cb56b0456e171"
 "checksum encoding_rs_io 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1cc3c5651fb62ab8aa3103998dade57efdd028544bd300516baa31840c252a83"
-"checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3"
+"checksum fnv 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 "checksum fs_extra 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5f2a4a2034423744d2cc7ca2068453168dcdb82c438419e639a26bd87839c674"
 "checksum globset 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "7ad1da430bd7281dde2576f44c84cc3f0f7b475e7202cd503042dff01a8c8120"
-"checksum grep 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "e91bca2e93ae153cb13bbf837129ef5831e8d39ea9a8b4527c8d316a8e4ee0d1"
-"checksum grep-cli 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ed5e5eb2190c17996aabc6d35abfc3a0c16659a92488261d13ede46748d9ab38"
+"checksum grep 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "582e93ba59eae0f9607f53832326f351f87a5175f17ff123b3986b927a0e7e68"
+"checksum grep-cli 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3592784f7791f5f0bfc2e4b5595dc2d4e34a79099d7228d121b954bae73db182"
 "checksum grep-matcher 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "fdf0e1fd5af17008a918fd868e63ec0226e96ce88b832f00c7fb041e014b9350"
 "checksum grep-pcre2 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4b4f4fb8154a3bcfa96817f0e3b020bff9c92ec05a1e5f6b763f20895058686a"
 "checksum grep-printer 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "7f34d40c840fe8e413a94598345d8a4bb25fdbb4f3860a6c00a88bb296d89d00"
 "checksum grep-regex 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "a7ba5e492a049950acbd60f5d183011fdca66c248663f6b4e118d591eeada3d2"
 "checksum grep-searcher 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "19897320890970db77fb9e8110aeafdf5a74f4ee32756db16d44a96d8f454b1b"
-"checksum hermit-abi 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "61565ff7aaace3525556587bd2dc31d4a07071957be715e63ce7b1eccf51a8f4"
-"checksum ignore 0.4.15 (registry+https://github.com/rust-lang/crates.io-index)" = "128b9e89d15a3faa642ee164c998fd4fae3d89d054463cddb2c25a7baad3a352"
+"checksum hermit-abi 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "91780f809e750b0a89f5544be56617ff6b1227ee485bcb06ebe10cdf89bd3b71"
+"checksum ignore 0.4.16 (registry+https://github.com/rust-lang/crates.io-index)" = "22dcbf2a4a289528dbef21686354904e1c694ac642610a9bff9e7df730d9ec72"
 "checksum itoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "b8b7a7c0c47db5545ed3fef7468ee7bb5b74691498139e4b3f6a20685dc6dd8e"
 "checksum jemalloc-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0d3b9f3f5c9b31aa0f5ed3260385ac205db665baa41d49bb8338008ae94ede45"
 "checksum jemallocator 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "43ae63fcfc45e99ab3d1b29a46782ad679e98436c3169d15a167a1108a724b69"
 "checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-"checksum libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)" = "99e85c08494b21a9054e7fe1374a732aeadaff3980b6990b94bfd3a70f690005"
+"checksum libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)" = "9457b06509d27052635f90d6466700c65095fdf75409b3fbdd903e988b886f49"
 "checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
 "checksum memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400"
 "checksum memmap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b"
@@ -560,18 +560,18 @@
 "checksum pcre2 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "85b30f2f69903b439dd9dc9e824119b82a55bf113b29af8d70948a03c1b11ab1"
 "checksum pcre2-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "876c72d05059d23a84bd9fcdc3b1d31c50ea7fe00fe1522b4e68cd3608db8d5b"
 "checksum pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677"
-"checksum proc-macro2 1.0.12 (registry+https://github.com/rust-lang/crates.io-index)" = "8872cf6f48eee44265156c111456a700ab3483686b3f96df4cf5481c89157319"
-"checksum quote 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4c1f4b0efa5fc5e8ceb705136bfee52cfdb6a4e3509f770b478cd6ed434232a7"
-"checksum regex 1.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "a6020f034922e3194c711b82a627453881bc4682166cabb07134a10c26ba7692"
+"checksum proc-macro2 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)" = "1502d12e458c49a4c9cbff560d0fe0060c252bc29799ed94ca2ed4bb665a0101"
+"checksum quote 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "54a21852a652ad6f610c9510194f398ff6f8692e334fd1145fed931f7fbe44ea"
+"checksum regex 1.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6"
 "checksum regex-automata 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "ae1ded71d66a4a97f5e961fd0cb25a5f366a42a41570d16a763a69c092c26ae4"
-"checksum regex-syntax 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)" = "7fe5bd57d1d7414c6b5ed48563a2c855d995ff777729dcd91c369ec7fea395ae"
+"checksum regex-syntax 0.6.18 (registry+https://github.com/rust-lang/crates.io-index)" = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8"
 "checksum ryu 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ed3d612bc64430efeb3f7ee6ef26d590dce0c43249217bddc62112540c7941e1"
 "checksum same-file 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
-"checksum serde 1.0.107 (registry+https://github.com/rust-lang/crates.io-index)" = "eba7550f2cdf88ffc23ab0f1607133486c390a8c0f89b57e589b9654ee15e04d"
-"checksum serde_derive 1.0.107 (registry+https://github.com/rust-lang/crates.io-index)" = "10be45e22e5597d4b88afcc71f9d7bfadcd604bf0c78a3ab4582b8d2b37f39f3"
-"checksum serde_json 1.0.52 (registry+https://github.com/rust-lang/crates.io-index)" = "a7894c8ed05b7a3a279aeb79025fdec1d3158080b75b98a08faf2806bb799edd"
+"checksum serde 1.0.110 (registry+https://github.com/rust-lang/crates.io-index)" = "99e7b308464d16b56eba9964e4972a3eee817760ab60d88c3f86e1fecb08204c"
+"checksum serde_derive 1.0.110 (registry+https://github.com/rust-lang/crates.io-index)" = "818fbf6bfa9a42d3bfcaca148547aa00c7b915bec71d1757aa2d44ca68771984"
+"checksum serde_json 1.0.53 (registry+https://github.com/rust-lang/crates.io-index)" = "993948e75b189211a9b31a7528f950c6adc21f9720b6438ff80a7fa2f864cea2"
 "checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
-"checksum syn 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)" = "e8e5aa70697bb26ee62214ae3288465ecec0000f05182f039b477001f08f5ae7"
+"checksum syn 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)" = "ef781e621ee763a2a40721a8861ec519cb76966aee03bb5d00adb6a31dc1c1de"
 "checksum termcolor 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f"
 "checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
 "checksum thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14"
diff -Nru rust-ripgrep-12.1.0/Cargo.toml rust-ripgrep-12.1.1/Cargo.toml
--- rust-ripgrep-12.1.0/Cargo.toml	2020-05-09 15:39:15.000000000 +0000
+++ rust-ripgrep-12.1.1/Cargo.toml	2020-05-29 13:53:06.000000000 +0000
@@ -13,7 +13,7 @@
 [package]
 edition = "2018"
 name = "ripgrep"
-version = "12.1.0"
+version = "12.1.1"
 authors = ["Andrew Gallant <jamslam@gmail.com>"]
 build = "build.rs"
 exclude = ["HomebrewFormula"]
@@ -51,10 +51,10 @@
 default-features = false
 
 [dependencies.grep]
-version = "0.2.6"
+version = "0.2.7"
 
 [dependencies.ignore]
-version = "0.4.15"
+version = "0.4.16"
 
 [dependencies.lazy_static]
 version = "1.1.0"
diff -Nru rust-ripgrep-12.1.0/Cargo.toml.orig rust-ripgrep-12.1.1/Cargo.toml.orig
--- rust-ripgrep-12.1.0/Cargo.toml.orig	2020-05-09 15:13:32.000000000 +0000
+++ rust-ripgrep-12.1.1/Cargo.toml.orig	2020-05-29 13:26:46.000000000 +0000
@@ -1,6 +1,6 @@
 [package]
 name = "ripgrep"
-version = "12.1.0"  #:version
+version = "12.1.1"  #:version
 authors = ["Andrew Gallant <jamslam@gmail.com>"]
 description = """
 ripgrep is a line-oriented search tool that recursively searches your current
@@ -43,8 +43,8 @@
 
 [dependencies]
 bstr = "0.2.12"
-grep = { version = "0.2.6", path = "crates/grep" }
-ignore = { version = "0.4.15", path = "crates/ignore" }
+grep = { version = "0.2.7", path = "crates/grep" }
+ignore = { version = "0.4.16", path = "crates/ignore" }
 lazy_static = "1.1.0"
 log = "0.4.5"
 num_cpus = "1.8.0"
diff -Nru rust-ripgrep-12.1.0/.cargo_vcs_info.json rust-ripgrep-12.1.1/.cargo_vcs_info.json
--- rust-ripgrep-12.1.0/.cargo_vcs_info.json	2020-05-09 15:39:15.000000000 +0000
+++ rust-ripgrep-12.1.1/.cargo_vcs_info.json	2020-05-29 13:53:06.000000000 +0000
@@ -1,5 +1,5 @@
 {
   "git": {
-    "sha1": "6162b000a3b131101755bccf7c92a893b9f8570c"
+    "sha1": "7cb211378a2ac6d421c5f6f3f71411937af23136"
   }
 }
diff -Nru rust-ripgrep-12.1.0/CHANGELOG.md rust-ripgrep-12.1.1/CHANGELOG.md
--- rust-ripgrep-12.1.0/CHANGELOG.md	2020-05-09 15:35:50.000000000 +0000
+++ rust-ripgrep-12.1.1/CHANGELOG.md	2020-05-29 13:53:03.000000000 +0000
@@ -1,3 +1,21 @@
+12.1.1 (2020-05-29)
+===================
+ripgrep 12.1.1 is a patch release that fixes a couple small bugs. In
+particular, the ripgrep 12.1.0 release did not tag new releases for all of its
+in-tree dependencies. As a result, ripgrep built dependencies from crates.io
+would produce a different build than compiling ripgrep from source on the
+`12.1.0` tag. Namely, some crates like `grep-cli` had unreleased changes.
+
+Bug fixes:
+
+* [BUG #1581](https://github.com/BurntSushi/ripgrep/issues/1581):
+  Corrects some egregious markup output in `--help`.
+* [BUG #1591](https://github.com/BurntSushi/ripgrep/issues/1591):
+  Mention the special `$0` capture group in docs for the `-r/--replace` flag.
+* [BUG #1602](https://github.com/BurntSushi/ripgrep/issues/1602):
+  Fix failing test resulting from out-of-sync dependencies.
+
+
 12.1.0 (2020-05-09)
 ===================
 ripgrep 12.1.0 is a small minor version release that mostly includes bug fixes
diff -Nru rust-ripgrep-12.1.0/crates/core/app.rs rust-ripgrep-12.1.1/crates/core/app.rs
--- rust-ripgrep-12.1.0/crates/core/app.rs	2020-05-09 03:36:05.000000000 +0000
+++ rust-ripgrep-12.1.1/crates/core/app.rs	2020-05-22 02:20:27.000000000 +0000
@@ -1354,7 +1354,7 @@
 When this flag is set, every file and directory is applied to it to test for
 a match. So for example, if you only want to search in a particular directory
 'foo', then *-g foo* is incorrect because 'foo/bar' does not match the glob
-'foo'. Instead, you should use *-g +++'foo/**'+++*.
+'foo'. Instead, you should use *-g 'foo/**'*.
 "
     );
     let arg = RGArg::flag("glob", "GLOB")
@@ -2576,10 +2576,13 @@
 flag nor any other ripgrep flag will modify your files.
 
 Capture group indices (e.g., $5) and names (e.g., $foo) are supported in the
-replacement string. In shells such as Bash and zsh, you should wrap the
-pattern in single quotes instead of double quotes. Otherwise, capture group
-indices will be replaced by expanded shell variables which will most likely
-be empty.
+replacement string. Capture group indices are numbered based on the position of
+the opening paranthesis of the group, where the leftmost such group is $1. The
+special $0 group corresponds to the entire match.
+
+In shells such as Bash and zsh, you should wrap the pattern in single quotes
+instead of double quotes. Otherwise, capture group indices will be replaced by
+expanded shell variables which will most likely be empty.
 
 To write a literal '$', use '$$'.
 
diff -Nru rust-ripgrep-12.1.0/crates/core/args.rs rust-ripgrep-12.1.1/crates/core/args.rs
--- rust-ripgrep-12.1.0/crates/core/args.rs	2020-03-24 19:29:48.000000000 +0000
+++ rust-ripgrep-12.1.1/crates/core/args.rs	2020-05-28 12:16:38.000000000 +0000
@@ -346,7 +346,7 @@
         Ok(self.matches().walker_builder(self.paths())?.build())
     }
 
-    /// Return a walker that never uses additional threads.
+    /// Return a parallel walker that may use additional threads.
     pub fn walker_parallel(&self) -> Result<WalkParallel> {
         Ok(self.matches().walker_builder(self.paths())?.build_parallel())
     }
diff -Nru rust-ripgrep-12.1.0/debian/changelog rust-ripgrep-12.1.1/debian/changelog
--- rust-ripgrep-12.1.0/debian/changelog	2020-05-10 14:48:40.000000000 +0000
+++ rust-ripgrep-12.1.1/debian/changelog	2020-06-20 08:59:18.000000000 +0000
@@ -1,3 +1,9 @@
+rust-ripgrep (12.1.1-1) unstable; urgency=medium
+
+  * Package ripgrep 12.1.1 from crates.io using debcargo 2.4.3
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 20 Jun 2020 10:59:18 +0200
+
 rust-ripgrep (12.1.0-1) unstable; urgency=medium
 
   * Package ripgrep 12.1.0 from crates.io using debcargo 2.4.2
diff -Nru rust-ripgrep-12.1.0/debian/control rust-ripgrep-12.1.1/debian/control
--- rust-ripgrep-12.1.0/debian/control	2020-05-10 14:48:40.000000000 +0000
+++ rust-ripgrep-12.1.1/debian/control	2020-06-20 08:59:18.000000000 +0000
@@ -8,9 +8,9 @@
  libstd-rust-dev,
  librust-bstr-0.2+default-dev (>= 0.2.12-~~),
  librust-clap-2+suggestions-dev (>= 2.33.0-~~),
- librust-grep-0.2+default-dev (>= 0.2.6-~~),
+ librust-grep-0.2+default-dev (>= 0.2.7-~~),
  librust-grep-searcher+default-dev (>= 0.1.3-~~),
- librust-ignore-0.4+default-dev (>= 0.4.15-~~),
+ librust-ignore-0.4+default-dev (>= 0.4.16-~~),
  librust-lazy-static-1+default-dev (>= 1.1.0-~~),
  librust-log-0.4+default-dev (>= 0.4.5-~~),
  librust-num-cpus-1+default-dev (>= 1.8.0-~~),
diff -Nru rust-ripgrep-12.1.0/debian/patches/increase-grep-searcher-dep.diff rust-ripgrep-12.1.1/debian/patches/increase-grep-searcher-dep.diff
--- rust-ripgrep-12.1.0/debian/patches/increase-grep-searcher-dep.diff	2020-05-10 14:48:40.000000000 +0000
+++ rust-ripgrep-12.1.1/debian/patches/increase-grep-searcher-dep.diff	2020-06-20 08:59:18.000000000 +0000
@@ -4,11 +4,11 @@
 +++ ripgrep/Cargo.toml
 @@ -53,6 +53,9 @@ default-features = false
  [dependencies.grep]
- version = "0.2.6"
+ version = "0.2.7"
  
 +[dependencies.grep-searcher]
 +version = ">= 0.1.3"
 +
  [dependencies.ignore]
- version = "0.4.15"
+ version = "0.4.16"
  
diff -Nru rust-ripgrep-12.1.0/pkg/brew/ripgrep-bin.rb rust-ripgrep-12.1.1/pkg/brew/ripgrep-bin.rb
--- rust-ripgrep-12.1.0/pkg/brew/ripgrep-bin.rb	2020-05-09 02:37:54.000000000 +0000
+++ rust-ripgrep-12.1.1/pkg/brew/ripgrep-bin.rb	2020-05-29 13:53:03.000000000 +0000
@@ -1,14 +1,14 @@
 class RipgrepBin < Formula
-  version '12.0.1'
+  version '12.1.0'
   desc "Recursively search directories for a regex pattern."
   homepage "https://github.com/BurntSushi/ripgrep"
 
   if OS.mac?
       url "https://github.com/BurntSushi/ripgrep/releases/download/#{version}/ripgrep-#{version}-x86_64-apple-darwin.tar.gz"
-      sha256 "59e78931a7577e76f40c937cae2782f2bbdcb40f056df5dd84247a671373525d"
+      sha256 "974351ca7d00083ba2fad52e2f2539c8ff114119c139420f592507962ab43b75"
   elsif OS.linux?
       url "https://github.com/BurntSushi/ripgrep/releases/download/#{version}/ripgrep-#{version}-x86_64-unknown-linux-musl.tar.gz"
-      sha256 "2dbd6e0cef8048f26ea9f0d6b5412f117645001c5cec267b3bcd4716a64a7a7a"
+      sha256 "c6bba6d643b1a1f18994683e26d4d2b998b41a7a7360e63cb8ec9db8ffbf793c"
   end
 
   conflicts_with "ripgrep"
@@ -18,7 +18,6 @@
     man1.install "doc/rg.1"
 
     bash_completion.install "complete/rg.bash"
-    fish_completion.install "complete/rg.fish"
     zsh_completion.install "complete/_rg"
   end
 end
diff -Nru rust-ripgrep-12.1.0/RELEASE-CHECKLIST.md rust-ripgrep-12.1.1/RELEASE-CHECKLIST.md
--- rust-ripgrep-12.1.0/RELEASE-CHECKLIST.md	2020-05-09 15:15:36.000000000 +0000
+++ rust-ripgrep-12.1.1/RELEASE-CHECKLIST.md	2020-05-29 13:53:03.000000000 +0000
@@ -19,17 +19,25 @@
     * crates/printer
     * crates/grep (bump minimal versions as necessary)
     * crates/core (do **not** bump version, but update dependencies as needed)
+* Update the CHANGELOG as appropriate.
 * Edit the `Cargo.toml` to set the new ripgrep version. Run
   `cargo update -p ripgrep` so that the `Cargo.lock` is updated. Commit the
-  changes. Alternatively, use
-  `cargo-up --no-push --no-release Cargo.toml {VERSION}`.
-* Create a new signed tag for the ripgrep release. Push it to GitHub.
+  changes and create a new signed tag. Alternatively, use
+  `cargo-up --no-push --no-release Cargo.toml {VERSION}` to automate this.
 * Wait for CI to finish creating the release. If the release build fails, then
   delete the tag from GitHub, make fixes, re-tag, delete the release and push.
 * Copy the relevant section of the CHANGELOG to the tagged release notes.
+  Include this blurb describing what ripgrep is:
+  > In case you haven't heard of it before, ripgrep is a line-oriented search
+  > tool that recursively searches your current directory for a regex pattern.
+  > By default, ripgrep will respect your gitignore rules and automatically
+  > skip hidden files/directories and binary files.
 * Run `ci/build-deb` locally and manually upload the deb package to the
   release.
 * Run `cargo publish`.
-* Run `ci/sha256-releases >> pkg/brew/ripgrep-bin.rb`. Then edit
-  `pkg/brew/ripgrep-bin.rb` to update the version numbers and sha256 hashes.
+* Run `ci/sha256-releases {VERSION} >> pkg/brew/ripgrep-bin.rb`. Then edit
+  `pkg/brew/ripgrep-bin.rb` to update the version number and sha256 hashes.
   Remove extraneous stuff added by `ci/sha256-releases`. Commit changes.
+
+Note that
+[`cargo-up` can be found in BurntSushi's dotfiles](https://github.com/BurntSushi/dotfiles/blob/master/bin/cargo-up).