From 4282274e6464f3dd8cb856a299bff37a05dc6c58 Mon Sep 17 00:00:00 2001
From: Eric Huss <eric@huss.org>
Date: Sun, 31 Mar 2019 14:05:49 -0700
Subject: [PATCH] new/init: Don't include email if it is empty.

---
 src/cargo/ops/cargo_new.rs |  8 +++++++-
 tests/testsuite/new.rs     | 11 +++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/cargo/ops/cargo_new.rs b/src/cargo/ops/cargo_new.rs
index 9e0d70d27dc..ec082f55ea3 100644
--- a/src/cargo/ops/cargo_new.rs
+++ b/src/cargo/ops/cargo_new.rs
@@ -567,7 +567,13 @@ fn mk(config: &Config, opts: &MkOptions<'_>) -> CargoResult<()> {
         (Some(name), Some(email), _, _)
         | (Some(name), None, _, Some(email))
         | (None, Some(email), name, _)
-        | (None, None, name, Some(email)) => format!("{} <{}>", name, email),
+        | (None, None, name, Some(email)) => {
+            if email.is_empty() {
+                name
+            } else {
+                format!("{} <{}>", name, email)
+            }
+        }
         (Some(name), None, _, None) | (None, None, name, None) => name,
     };
 
diff --git a/tests/testsuite/new.rs b/tests/testsuite/new.rs
index dd4ff7ab3bc..5076107e7a4 100644
--- a/tests/testsuite/new.rs
+++ b/tests/testsuite/new.rs
@@ -511,3 +511,14 @@ fn new_with_bad_edition() {
         .with_status(1)
         .run();
 }
+
+#[test]
+fn new_with_blank_email() {
+    cargo_process("new foo")
+        .env("CARGO_NAME", "Sen")
+        .env("CARGO_EMAIL", "")
+        .run();
+
+    let contents = fs::read_to_string(paths::root().join("foo/Cargo.toml")).unwrap();
+    assert!(contents.contains(r#"authors = ["Sen"]"#), contents);
+}