From 0292a94f9a3ed52ff62f184c95546df68ec40d98 Mon Sep 17 00:00:00 2001 From: Chris de Graaf Date: Fri, 6 Oct 2017 15:02:25 +0100 Subject: [PATCH] Fix Git configuration bug --- src/template.jl | 5 +++-- test/interactive/interactive.jl | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/template.jl b/src/template.jl index 3c08e05..bf59e3f 100644 --- a/src/template.jl +++ b/src/template.jl @@ -217,8 +217,9 @@ function interactive_template(; fast::Bool=false) gitconfig = Dict() print("Enter any Git key-value pairs (one at a time, separated by spaces) [None]: ") while true - tokens = split(readline()) - isempty(tokens) && break + line = readline() + isempty(line) && break + tokens = split(line, " ", limit=2) if haskey(gitconfig, tokens[1]) warn("Duplicate key '$(tokens[1])': Replacing old value '$(tokens[2])'") end diff --git a/test/interactive/interactive.jl b/test/interactive/interactive.jl index a5c23ce..fa1987c 100644 --- a/test/interactive/interactive.jl +++ b/test/interactive/interactive.jl @@ -61,7 +61,8 @@ end @testset "Interactive package generation" begin - write(STDIN.buffer, "$me\n\n\r\n\n\n\n\nd") + cfg = join(["$(p.first) $(p.second)" for p in gitconfig], "\n") + write(STDIN.buffer, "$me\n\n\r\n\n\n\n$cfg\n\nd") generate_interactive(test_pkg) @test isdir(Pkg.dir(test_pkg)) rm(Pkg.dir(test_pkg); force=true, recursive=true)