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

Fix flag of git-worktree in test_branch.sh and bisect.sh #1027

Merged
merged 4 commits into from
Sep 24, 2019
Merged

Fix flag of git-worktree in test_branch.sh and bisect.sh #1027

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d80d8c5
Fix test_branch.sh
gpetiot Sep 24, 2019
d674246
update changes
gpetiot Sep 24, 2019
5810013
same in bisect.sh
gpetiot Sep 24, 2019
1f2a510
update changelog
gpetiot Sep 24, 2019
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
2 changes: 2 additions & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
### (master)

+ Fix test_branch.sh (#1027) (Guillaume Petiot)
+ Improve: remove the bisect_ppx dependency and clean Makefile (#1005) (Jules Aguillon)
+ Project: use a CHANGES.md log file again (#1023) (Guillaume Petiot)
+ Support OCaml 4.09.0 (add the odoc.1.4.2 dependency) (#1024) (Guillaume Petiot)
+ Parse toplevel directives (#1020) (Jules Aguillon)
Expand Down
2 changes: 1 addition & 1 deletion tools/test_branch.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ run_in_worktree ()
make -C "$tmp"
local exe=`ls "$tmp"/_build/{default,dev}/src/ocamlformat.exe 2>/dev/null | head -n1`
OCAMLFORMAT_EXE=$exe make -C test-extra "$@"
git worktree remove -f "$tmp"
git worktree remove --force "$tmp"
}

OCAMLFORMAT="$2" run_in_worktree "$base" test_setup test_unstage test_clean test_pull test test_stage
Expand Down