diff options
| author | Tristan Sloughter <t@crashfast.com> | 2015-05-03 11:51:52 -0500 |
|---|---|---|
| committer | Tristan Sloughter <t@crashfast.com> | 2015-05-03 12:16:00 -0500 |
| commit | d4c7dea7351435eaafe56a23845d8772e4bac0ac (patch) | |
| tree | 38b2ebf4f65f44274628a6bc4c10ef43d0bc5976 | |
| parent | 214d6c979756a0acfcfa52d88d07ba882cde56d7 (diff) | |
only fetch branch needed, remove rebar_vsn_plugins from erlware_commons
| -rw-r--r-- | rebar.config | 2 | ||||
| -rw-r--r-- | rebar.lock | 6 | ||||
| -rw-r--r-- | src/rebar_git_resource.erl | 2 |
3 files changed, 3 insertions, 7 deletions
diff --git a/rebar.config b/rebar.config index 89acac7..abd34c5 100644 --- a/rebar.config +++ b/rebar.config @@ -46,4 +46,4 @@ ]}. %% Overrides -{overrides, [{override, erlware_commons, [{plugins, []}]}]}. +{overrides, [{override, erlware_commons, [{deps, []}, {plugins, []}]}]}. @@ -1,8 +1,4 @@ -[{<<"rebar_vsn_plugin">>, - {git,"https://github.com/erlware/rebar_vsn_plugin.git", - {ref,"fd40c960c7912193631d948fe962e1162a8d1334"}}, - 2}, - {<<"relx">>, +[{<<"relx">>, {git,"https://github.com/tsloughter/relx.git", {ref,"6e0d048d3840464539deddd9d5b53e9f421edee4"}}, 0}, diff --git a/src/rebar_git_resource.erl b/src/rebar_git_resource.erl index 4e7485c..07c9b4d 100644 --- a/src/rebar_git_resource.erl +++ b/src/rebar_git_resource.erl @@ -32,7 +32,7 @@ needs_update(Dir, {git, Url, {tag, Tag}}) -> not ((Current1 =:= Tag) andalso compare_url(Dir, Url)); needs_update(Dir, {git, Url, {branch, Branch}}) -> %% Fetch remote so we can check if the branch has changed - {ok, _} = rebar_utils:sh(?FMT("git fetch", []), + {ok, _} = rebar_utils:sh(?FMT("git fetch origin ~s", [Branch]), [{cd, Dir}]), %% Check for new commits to origin/Branch {ok, Current} = rebar_utils:sh(?FMT("git log HEAD..origin/~s --oneline", [Branch]), |