Accept more forms of git versions

Fixes the parsing of “git version 1.9.3 (Apple Git-50)”.
Closes #2653.

Author: ericmj

lib/mix/lib/mix/scm/git.ex

@@ -183,14 +183,26 @@ defmodule Mix.SCM.Git do
       {:ok, version} ->
         version
       :error ->
-        "git version " <> version = String.strip IO.iodata_to_binary :os.cmd('git --version')
         version =
-          String.split(version, ".")
-          |> Enum.take(3)
-          |> Enum.map(&String.to_integer(&1))
-          |> List.to_tuple
+          :os.cmd('git --version')
+          |> IO.iodata_to_binary
+          |> String.strip
+          |> parse_version
+
         Application.put_env(:mix, :git_version, version)
         version
     end
   end
+
+  defp parse_version("git version " <> version) do
+    String.split(version, ".")
+    |> Enum.take(3)
+    |> Enum.map(&to_integer/1)
+    |> List.to_tuple
+  end
+
+  defp to_integer(string) do
+    {int, _} = Integer.parse(string)
+    int
+  end
 end

lib/mix/lib/mix/tasks/escript.build.ex

@@ -108,7 +108,7 @@ defmodule Mix.Tasks.Escript.Build do
 
         case :zip.create 'mem', tuples, [:memory] do
           {:ok, {'mem', zip}} ->
-            shebang  = escript_opts[:shebang]  || "#! /usr/bin/env escript\n"
+            shebang  = escript_opts[:shebang] || "#! /usr/bin/env escript\n"
             comment  = build_comment(escript_opts[:comment])
             emu_args = build_emu_args(escript_opts[:emu_args], escript_mod)
 

lib/mix/lib/mix/tasks/loadpaths.ex

@@ -6,7 +6,7 @@ defmodule Mix.Tasks.Loadpaths do
 
   ## Command line options
 
-    * `--no-deps-check` - do not check depednecnies
+    * `--no-deps-check` - do not check dependencies
     * `--no-elixir-version-check` - do not check elixir version
 
   """

lib/mix/lib/mix/tasks/new.ex

@@ -205,13 +205,13 @@ defmodule Mix.Tasks.New do
   <%= @otp_app %>
     end
 
-    # Dependencies can be hex.pm packages:
+    # Dependencies can be Hex packages:
     #
     #   {:mydep, "~> 0.3.0"}
     #
     # Or git/path repositories:
     #
-    #   {:mydep, git: "https://github.com/elixir-lang/mydep.git", tag: "0.1"}
+    #   {:mydep, git: "https://github.com/elixir-lang/mydep.git", tag: "0.1.0"}
     #
     # Type `mix help deps` for more examples and options
     defp deps do
@@ -240,13 +240,13 @@ defmodule Mix.Tasks.New do
   <%= @otp_app %>
     end
 
-    # Dependencies can be hex.pm packages:
+    # Dependencies can be Hex packages:
     #
     #   {:mydep, "~> 0.3.0"}
     #
     # Or git/path repositories:
     #
-    #   {:mydep, git: "https://github.com/elixir-lang/mydep.git", tag: "0.1"}
+    #   {:mydep, git: "https://github.com/elixir-lang/mydep.git", tag: "0.1.0"}
     #
     # To depend on another app inside the umbrella:
     #
@@ -268,13 +268,13 @@ defmodule Mix.Tasks.New do
        deps: deps]
     end
 
-    # Dependencies can be hex.pm packages:
+    # Dependencies can be Hex packages:
     #
     #   {:mydep, "~> 0.3.0"}
     #
     # Or git/path repositories:
     #
-    #   {:mydep, git: "https://github.com/elixir-lang/mydep.git", tag: "0.1"}
+    #   {:mydep, git: "https://github.com/elixir-lang/mydep.git", tag: "0.1.0"}
     #
     # Type `mix help deps` for more examples and options.
     #