Fix test dependency (git)

.github/workflows/package.yml

@@ -46,5 +46,5 @@ jobs:
           options: --rm -v ${{ github.workspace }}:/workspace -w /workspace
           run: |
             set -o errexit
-            apk add --no-cache bash make
+            apk add bash make
             make build

.github/workflows/test.yml

@@ -46,6 +46,6 @@ jobs:
           options: --rm -v ${{ github.workspace }}:/workspace -w /workspace
           run: |
             set -o errexit
-            apk add --no-cache bash less make
-            python3 -m pip install -r requirements-dev.txt
+            apk add bash git less make
+            pip install -r requirements-dev.txt
             make test

tests/test_ydiff.py

@@ -685,7 +685,7 @@ def setUp(self):
         self._cwd = os.getcwd()
         self._ws = tempfile.mkdtemp(prefix='test_ydiff')
         self._non_ws = tempfile.mkdtemp(prefix='test_ydiff')
-        cmd = ('cd %s; git init; git config user.name me; '
+        cmd = ('set -o errexit; cd %s; git init; git config user.name me; '
                'git config user.email [email protected]') % self._ws
         subprocess.call(cmd, shell=True, stdout=subprocess.PIPE)
         self._change_file('init')
@@ -696,12 +696,12 @@ def tearDown(self):
         subprocess.call(cmd)
 
     def _change_file(self, text):
-        cmd = ['/bin/sh', '-c',
+        cmd = ['/bin/sh', '-ec',
                'cd %s; echo "%s" > foo' % (self._ws, text)]
         subprocess.call(cmd)
 
     def _commit_file(self):
-        cmd = ['/bin/sh', '-c',
+        cmd = ['/bin/sh', '-ec',
                'cd %s; git add foo; git commit foo -m update' % self._ws]
         subprocess.call(cmd, stdout=subprocess.PIPE)