Skip to content

Commit

Permalink
minimal-zip: fix unzip
Browse files Browse the repository at this point in the history
The `unzip.exe` tool we are including in the minimal subset of Git for
Windows' SDK nowadays links to `msys-bz2-1.dll`, but that library was
not included.

Let's include it, and add a test that verifies that this tool works.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
  • Loading branch information
dscho committed Mar 8, 2023
1 parent ed0213b commit 994f67f
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 0 deletions.
12 changes: 12 additions & 0 deletions .github/workflows/ci-artifacts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -145,3 +145,15 @@ jobs:
# stat works
test "stat is /usr/bin/stat" = "$(type stat)" || exit 1
stat /usr/bin/stat.exe || exit 1
# unzip works
test "unzip is /usr/bin/unzip" = "$(type unzip)" || exit 1
git init unzip-test &&
echo TEST >unzip-test/README &&
git -C unzip-test add -A &&
git -C unzip-test -c user.name=A -c user.email=b@c.d commit -m 'Testing, testing...' &&
git --git-dir=unzip-test/.git archive -o test.zip HEAD &&
unzip -v test.zip >unzip-test.out &&
cat unzip-test.out &&
test "grep is /usr/bin/grep" = "$(type grep)" || exit 1
grep README unzip-test.out
1 change: 1 addition & 0 deletions .sparse/minimal-sdk
Original file line number Diff line number Diff line change
Expand Up @@ -266,5 +266,6 @@
/usr/bin/tput.exe
/usr/bin/true.exe
/usr/bin/unzip.exe
/usr/bin/msys-bz2-[0-9]*.dll
/usr/bin/xargs.exe
/usr/bin/zipinfo.exe

0 comments on commit 994f67f

Please sign in to comment.