Merge pull request #381 from tsloughter/upgrade_branch

on upgrade of git branch check against remote

rebar.config

@@ -46,4 +46,4 @@
            ]}.
 
 %% Overrides
-{overrides, [{override, erlware_commons, [{plugins, []}]}]}.
+{overrides, [{override, erlware_commons, [{deps, []}, {plugins, []}]}]}.

rebar.lock

@@ -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},

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 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]),
                                    [{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}) ->

src/rebar_prv_upgrade.erl

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