worch: sync with upstream (f37bf9e)
worch: update test for vcs/git