瀏覽代碼

on upgrade of git branch check against remote

pull/381/head
Tristan Sloughter 10 年之前
父節點
當前提交
214d6c9797
共有 2 個檔案被更改,包括 7 行新增5 行删除
  1. +7
    -4
      src/rebar_git_resource.erl
  2. +0
    -1
      src/rebar_prv_upgrade.erl

+ 7
- 4
src/rebar_git_resource.erl 查看文件

@ -31,11 +31,14 @@ needs_update(Dir, {git, Url, {tag, Tag}}) ->
?DEBUG("Comparing git tag ~s with ~s", [Tag, Current1]),
not ((Current1 =:= Tag) andalso compare_url(Dir, Url));
needs_update(Dir, {git, Url, {branch, Branch}}) ->
{ok, Current} = rebar_utils:sh(?FMT("git symbolic-ref -q --short HEAD", []),
%% Fetch remote so we can check if the branch has changed
{ok, _} = rebar_utils:sh(?FMT("git fetch", []),
[{cd, Dir}]),
%% Check for new commits to origin/Branch
{ok, Current} = rebar_utils:sh(?FMT("git log HEAD..origin/~s --oneline", [Branch]),
[{cd, Dir}]),
Current1 = string:strip(string:strip(Current, both, $\n), both, $\r),
?DEBUG("Comparing git branch ~s with ~s", [Branch, Current1]),
not ((Current1 =:= Branch) andalso compare_url(Dir, Url));
?DEBUG("Checking git branch ~s for updates", [Branch]),
not ((Current =:= []) andalso compare_url(Dir, Url));
needs_update(Dir, {git, Url, "master"}) ->
needs_update(Dir, {git, Url, {branch, "master"}});
needs_update(Dir, {git, Url, Ref}) ->

+ 0
- 1
src/rebar_prv_upgrade.erl 查看文件

@ -140,4 +140,3 @@ info_useless(Old, New) ->
|| Name <- Old,
not lists:member(Name, New)],
ok.

Loading…
取消
儲存