admin/topgrade
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

git/windows: fix output corruption when running git submodule (#543)

Browse Source
This commit is contained in:
Daniel Pittman
2020-10-07 13:25:54 -04:00
committed by GitHub
parent 5fbb0be7b7
commit 3a34672ee5
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/steps/git.rs
View File

@@ -1,7 +1,7 @@
use std::collections::HashSet; use std::collections::HashSet;
use std::io; use std::io;
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
use std::process::{Command, Output}; use std::process::{Command, Output, Stdio};
use anyhow::Result; use anyhow::Result;
use console::style; use console::style;
@@ -49,7 +49,10 @@ async fn pull_repository(repo: String, git: &PathBuf, ctx: &ExecutionContext<'_>
let mut command = AsyncCommand::new(git); let mut command = AsyncCommand::new(git);
command.args(&["pull", "--ff-only"]).current_dir(&repo); command
.stdin(Stdio::null())
.current_dir(&repo)
.args(&["pull", "--ff-only"]);
if let Some(extra_arguments) = ctx.config().git_arguments() { if let Some(extra_arguments) = ctx.config().git_arguments() {
command.args(extra_arguments.split_whitespace()); command.args(extra_arguments.split_whitespace());
@@ -59,6 +62,7 @@ async fn pull_repository(repo: String, git: &PathBuf, ctx: &ExecutionContext<'_>
let submodule_output = AsyncCommand::new(git) let submodule_output = AsyncCommand::new(git)
.args(&["submodule", "update", "--recursive"]) .args(&["submodule", "update", "--recursive"])
.current_dir(&repo) .current_dir(&repo)
.stdin(Stdio::null())
.output() .output()
.await?; .await?;
let result = check_output(pull_output).and_then(|_| check_output(submodule_output)); let result = check_output(pull_output).and_then(|_| check_output(submodule_output));
@@ -74,6 +78,7 @@ async fn pull_repository(repo: String, git: &PathBuf, ctx: &ExecutionContext<'_>
println!("{} {}:", style("Changed").yellow().bold(), &repo); println!("{} {}:", style("Changed").yellow().bold(), &repo);
Command::new(&git) Command::new(&git)
.stdin(Stdio::null())
.current_dir(&repo) .current_dir(&repo)
.args(&[ .args(&[
"--no-pager", "--no-pager",
@@ -99,8 +104,9 @@ async fn pull_repository(repo: String, git: &PathBuf, ctx: &ExecutionContext<'_>
fn get_head_revision(git: &Path, repo: &str) -> Option<String> { fn get_head_revision(git: &Path, repo: &str) -> Option<String> {
Command::new(git) Command::new(git)
.args(&["rev-parse", "HEAD"]) .stdin(Stdio::null())
.current_dir(repo) .current_dir(repo)
.args(&["rev-parse", "HEAD"])
.check_output() .check_output()
.map(|output| output.trim().to_string()) .map(|output| output.trim().to_string())
.map_err(|e| { .map_err(|e| {
@@ -113,8 +119,9 @@ fn get_head_revision(git: &Path, repo: &str) -> Option<String> {
fn has_remotes(git: &Path, repo: &str) -> Option<bool> { fn has_remotes(git: &Path, repo: &str) -> Option<bool> {
Command::new(git) Command::new(git)
.args(&["remote", "show"]) .stdin(Stdio::null())
.current_dir(repo) .current_dir(repo)
.args(&["remote", "show"])
.check_output() .check_output()
.map(|output| output.lines().count() > 0) .map(|output| output.lines().count() > 0)
.map_err(|e| { .map_err(|e| {
@@ -155,8 +162,9 @@ impl Git {
if let Some(git) = &self.git { if let Some(git) = &self.git {
let output = Command::new(&git) let output = Command::new(&git)
.args(&["rev-parse", "--show-toplevel"]) .stdin(Stdio::null())
.current_dir(path) .current_dir(path)
.args(&["rev-parse", "--show-toplevel"])
.check_output() .check_output()
.ok() .ok()
.map(|output| output.trim().to_string()); .map(|output| output.trim().to_string());