diff options
author | Seivan Heidari <[email protected]> | 2019-11-14 22:20:27 +0000 |
---|---|---|
committer | Seivan Heidari <[email protected]> | 2019-11-14 22:20:27 +0000 |
commit | c622413bc72ea56d5f62a16788d897cb61eca948 (patch) | |
tree | 9de3dbe8b5c935ed168efac4e70770e54fbe0714 /xtask/src/bin/pre-commit.rs | |
parent | 0525778a3ad590492b51cc11085d815f9bb8f92b (diff) | |
parent | bbb022d3999b3038549ec6c309efb065231c896a (diff) |
Merge branch 'master' of https://github.com/rust-analyzer/rust-analyzer into feature/themes
Diffstat (limited to 'xtask/src/bin/pre-commit.rs')
-rw-r--r-- | xtask/src/bin/pre-commit.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xtask/src/bin/pre-commit.rs b/xtask/src/bin/pre-commit.rs index cc6ccb25e..44507fb74 100644 --- a/xtask/src/bin/pre-commit.rs +++ b/xtask/src/bin/pre-commit.rs | |||
@@ -19,10 +19,10 @@ fn update_staged() -> Result<()> { | |||
19 | .current_dir(&root) | 19 | .current_dir(&root) |
20 | .output()?; | 20 | .output()?; |
21 | if !output.status.success() { | 21 | if !output.status.success() { |
22 | Err(format!( | 22 | anyhow::bail!( |
23 | "`git diff --diff-filter=MAR --name-only --cached` exited with {}", | 23 | "`git diff --diff-filter=MAR --name-only --cached` exited with {}", |
24 | output.status | 24 | output.status |
25 | ))?; | 25 | ); |
26 | } | 26 | } |
27 | for line in String::from_utf8(output.stdout)?.lines() { | 27 | for line in String::from_utf8(output.stdout)?.lines() { |
28 | run(&format!("git update-index --add {}", root.join(line).to_string_lossy()), ".")?; | 28 | run(&format!("git update-index --add {}", root.join(line).to_string_lossy()), ".")?; |