Merge pull request #155 from tuncer/fixes Fixes for #137 and #142
Project: http://git-wip-us.apache.org/repos/asf/couchdb-rebar/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-rebar/commit/988c9cd5 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-rebar/tree/988c9cd5 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-rebar/diff/988c9cd5 Branch: refs/heads/import Commit: 988c9cd574538d279193f548297d80ad3b0a45d0 Parents: 9a158d3 dfba6dd Author: Jared Morrow <[email protected]> Authored: Tue Nov 26 06:18:30 2013 -0800 Committer: Jared Morrow <[email protected]> Committed: Tue Nov 26 06:18:30 2013 -0800 ---------------------------------------------------------------------- src/rebar_core.erl | 2 +- src/rebar_deps.erl | 125 +++++++++++++++++++++++++-------------------- src/rebar_upgrade.erl | 27 +++++----- 3 files changed, 84 insertions(+), 70 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-rebar/blob/988c9cd5/src/rebar_core.erl ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-rebar/blob/988c9cd5/src/rebar_deps.erl ---------------------------------------------------------------------- diff --cc src/rebar_deps.erl index 5e69709,39510da..9911841 --- a/src/rebar_deps.erl +++ b/src/rebar_deps.erl @@@ -561,10 -569,11 +569,11 @@@ update_source1(AppDir, {git, _Url, {bra ShOpts = [{cd, AppDir}], rebar_utils:sh("git fetch origin", ShOpts), rebar_utils:sh(?FMT("git checkout -q ~s", [Branch]), ShOpts), - rebar_utils:sh(?FMT("git pull --ff-only --no-rebase -q origin ~s", [Branch]), ShOpts); + rebar_utils:sh( + ?FMT("git pull --ff-only --no-rebase -q origin ~s", [Branch]),ShOpts); update_source1(AppDir, {git, _Url, {tag, Tag}}) -> ShOpts = [{cd, AppDir}], - rebar_utils:sh("git fetch --tags origin", ShOpts), + rebar_utils:sh("git fetch origin", ShOpts), rebar_utils:sh(?FMT("git checkout -q ~s", [Tag]), ShOpts); update_source1(AppDir, {git, _Url, Refspec}) -> ShOpts = [{cd, AppDir}],
