Bläddra i källkod

Merge pull request #1198 from postHawk/fix-1185

#1185 fix windows git working directory
pull/1197/head
Fred Hebert 9 år sedan
förälder
incheckning
3dc62dba5d
1 ändrade filer med 9 tillägg och 2 borttagningar
  1. +9
    -2
      src/rebar_git_resource.erl

+ 9
- 2
src/rebar_git_resource.erl Visa fil

@ -18,9 +18,16 @@ lock(AppDir, {git, Url, _}) ->
lock(AppDir, {git, Url});
lock(AppDir, {git, Url}) ->
AbortMsg = io_lib:format("Locking of git dependency failed in ~s", [AppDir]),
Dir = rebar_utils:escape_double_quotes(AppDir),
{ok, VsnString} =
rebar_utils:sh("git --git-dir=\"" ++ rebar_utils:escape_double_quotes(AppDir) ++ "/.git\" rev-parse --verify HEAD",
[{use_stdout, false}, {debug_abort_on_error, AbortMsg}]),
case os:type() of
{win32, _} ->
rebar_utils:sh("git rev-parse --git-dir=\"" ++ Dir ++ "/.git\" --work-tree=\"" ++ Dir ++ "\" --verify HEAD",
[{use_stdout, false}, {debug_abort_on_error, AbortMsg}]);
_ ->
rebar_utils:sh("git --git-dir=\"" ++ Dir ++ "/.git\" rev-parse --verify HEAD",
[{use_stdout, false}, {debug_abort_on_error, AbortMsg}])
end,
Ref = string:strip(VsnString, both, $\n),
{git, Url, {ref, Ref}}.

Laddar…
Avbryt
Spara