Skip to content

Commit

Permalink
Pkg.update: call Base.with_env (not an exported function yet)
Browse files Browse the repository at this point in the history
  • Loading branch information
StefanKarpinski committed Oct 12, 2013
1 parent 7dfa093 commit 29c8f3c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion base/pkg/entry.jl
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ function update(branch::String)
Git.run(`checkout -q $branch`)
end
# TODO: handle merge conflicts
with_env("GIT_MERGE_AUTOEDIT","no") do
Base.with_env("GIT_MERGE_AUTOEDIT","no") do
Git.run(`pull -q`, out=DevNull)
end
end
Expand Down

0 comments on commit 29c8f3c

Please sign in to comment.