This bundle makes the CI succeed again.

5 patches for repository http://darcs.net/screened:

patch 0800ee2eab2a653a524f14d2c631d60ed3fc3c15
Author: Ben Franksen <ben.franksen@online.de>
Date:   Tue Apr 26 11:25:04 CEST 2022
  * tests/push.sh: simplify test for push to self

patch f54f55a45d139d6602e9002b16a45cda1bd62f7a
Author: Ben Franksen <ben.franksen@online.de>
Date:   Sun Apr 24 19:21:54 CEST 2022
  * fix problems with tests/issue189-external-merge-move.sh detected by the CI

  It seems creating a shell script and using that as external merge tool is
  not portable enough to work on Windows (even if we add the missing shebang
  line). So we create a small Haskell program and compile it.

patch 2f7533b51ecac401640ee66aaaf252ef3186249f
Author: Ben Franksen <ben.franksen@online.de>
Date:   Wed Apr 27 10:49:54 CEST 2022
  * canonicalize result of getCurrentDirectory on Windows

  This fixes problems detected by the CI. Before this patch we sometimes got
  DOS-style 8.3 directory names, which failed to compare equal to other
  repository paths with modern long names.

patch 90ec11a92628fa2074c1b0cab46f792710d793c9
Author: Ben Franksen <ben.franksen@online.de>
Date:   Wed Apr 27 11:18:26 CEST 2022
  * use fixUrl in clone command instead of ioAbsoluteOrRemote and toPath

  This is how it is done for most other commands that take repository
  locations as argument.

patch 289536e7f8a42c3c08a1d4161c824a18830641e7
Author: Ben Franksen <ben.franksen@online.de>
Date:   Thu Apr 28 14:05:33 CEST 2022
  * work-around to allow build with ghc >= 9.0 on Windows

  We indirectly depend on ansi-terminal, with ghc-9.0 cabal picks 0.11.1 which
  is missing a lower bound on its Win32 dependency (has been reported upstream
  and will be fixed soon). This makes it hard to write correct cabal file for
  all supported ghc versions. The work-around is to reject version 0.11.1 of
  ansi-terminal.

Attachments

• patch-preview.txt
• tests_push_sh_-simplify-test-for-push-to-self.dpatch

Looks good - accepting quickly as CI is breaking for me on reviewed :-)

[WSL2 running Ubuntu - there were two tests that generate temporary shell 
scripts not starting with #!/bin/sh - for some reason that breaks in my 
environment but apparently not elsewhere.]