diff options
| author | Karen Arutyunov <karen@codesynthesis.com> | 2020-09-22 22:18:18 +0300 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2020-09-29 15:01:07 +0300 |
| commit | b937ec2bf461ec06bf601e854f694e86060eba59 (patch) | |
| tree | 133cbb173399bddce1b35041cccd1ec67cd46deb /bdep/release.cxx | |
| parent | 39f6d06c729fc1b1ffdeda67daa0ddc1d6baadb0 (diff) | |
Use system git rather than bundled one for some operations on Windows
Diffstat (limited to 'bdep/release.cxx')
| -rw-r--r-- | bdep/release.cxx | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/bdep/release.cxx b/bdep/release.cxx index 66b4a30..3f13427 100644 --- a/bdep/release.cxx +++ b/bdep/release.cxx @@ -934,10 +934,11 @@ namespace bdep // process pr ( start_git (git_ver, + true /* system */, prj.path, - 0 /* stdin */, - 2 /* stdout */, - 2 /* stderr */, + 0 /* stdin */, + 2 /* stdout */, + 2 /* stderr */, "commit", verb < 1 ? "-q" : verb >= 2 ? "-v" : nullptr, amend ? "--amend" : nullptr, @@ -1040,8 +1041,9 @@ namespace bdep // optional<string> ms ( git_string (git_ver, + false /* system */, prj.path, - false /* ignore_error */, + false /* ignore_error */, "log", "--format=%B", "HEAD~" + to_string (o.squash ()) + "..HEAD")); @@ -1062,6 +1064,7 @@ namespace bdep // Squash commits, reverting them into the index. // run_git (git_ver, + true /* system */, prj.path, "reset", verb < 1 ? "-q" : nullptr, @@ -1085,6 +1088,7 @@ namespace bdep if (e.normal ()) { run_git (git_ver, + true /* system */, prj.path, "reset", verb < 1 ? "-q" : nullptr, @@ -1131,6 +1135,7 @@ namespace bdep const optional<project::current_tag>& ct (prj.cur_tag); run_git (git_ver, + true /* system */, prj.path, "tag", (ct && ct->action == cmd_release_current_tag::update @@ -1141,7 +1146,12 @@ namespace bdep *prj.tag); if (ct && ct->action == cmd_release_current_tag::remove) - run_git (git_ver, prj.path, "tag", "--delete", ct->name); + run_git (git_ver, + true /* system */, + prj.path, + "tag", + "--delete", + ct->name); } // Open. @@ -1197,7 +1207,11 @@ namespace bdep string remote; string brspec; { + // It's unlikely that the branch remote is configured globally, so we + // use the bundled git. + // optional<string> rem (git_line (git_ver, + false /* system */, prj.path, false /* ignore_error */, "config", |