Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adjusted hook tests to work on windows #236

Merged
merged 14 commits into from
Aug 18, 2020
Merged

Adjusted hook tests to work on windows #236

Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
0bca3ec
Adjusted hook tests to work on windows
dr-BEat Aug 16, 2020
7d3c726
Try installing git on windows
dr-BEat Aug 16, 2020
1748ec7
Apply path fix to make git bash available
dr-BEat Aug 16, 2020
51d9621
Another try
dr-BEat Aug 16, 2020
de1dea4
Fixed environment setup
dr-BEat Aug 16, 2020
47308f5
Environment reference
dr-BEat Aug 16, 2020
6285c28
Path environment
dr-BEat Aug 16, 2020
a3ad271
Switch to add-path command
dr-BEat Aug 16, 2020
256bdce
Test Path changes
dr-BEat Aug 18, 2020
0eeecc0
Test path2
dr-BEat Aug 18, 2020
8f21e59
Find out
dr-BEat Aug 18, 2020
9a4f687
Without add-path
dr-BEat Aug 18, 2020
4a362fb
Undo unnecessary ci.yml changes
dr-BEat Aug 18, 2020
5e1919b
Fix Command::new behaviour on windows
dr-BEat Aug 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 6 additions & 10 deletions asyncgit/src/sync/hooks.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ fn run_hook(
let output = Command::new("bash")
.args(bash_args)
.current_dir(path)
.env("DUMMYENV", "FixPathHandlingOnWindows") // This call forces Command to handle the Path environment correctly on windows, the specific env set here does not matter
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wtf... this is crazy! 🙈

.output();

let output = output.expect("general hook error");
Expand Down Expand Up @@ -183,8 +184,7 @@ mod tests {
let root = repo.path().parent().unwrap();
let repo_path = root.as_os_str().to_str().unwrap();

let hook = b"
#!/bin/sh
let hook = b"#!/bin/sh
exit 0
";

Expand All @@ -204,8 +204,7 @@ exit 0
let root = repo.path().parent().unwrap();
let repo_path = root.as_os_str().to_str().unwrap();

let hook = b"
#!/bin/sh
let hook = b"#!/bin/sh
echo 'msg' > $1
echo 'rejected'
exit 1
Expand All @@ -230,8 +229,7 @@ exit 1
let root = repo.path().parent().unwrap();
// let repo_path = root.as_os_str().to_str().unwrap();

let hook = b"
#!/bin/sh
let hook = b"#!/bin/sh
echo 'msg' > $1
echo 'rejected'
exit 1
Expand Down Expand Up @@ -261,8 +259,7 @@ exit 1
let root = repo.path().parent().unwrap();
let repo_path = root.as_os_str().to_str().unwrap();

let hook = b"
#!/bin/sh
let hook = b"#!/bin/sh
echo 'msg' > $1
exit 0
";
Expand All @@ -281,8 +278,7 @@ exit 0
let (_td, repo) = repo_init().unwrap();
let root = repo.path().parent().unwrap();

let hook = b"
#!/bin/sh
let hook = b"#!/bin/sh
echo 'rejected'
exit 1
";
Expand Down