On Thu, Apr 26, 2018 at 10:13 AM, Torsten Bögershausen <tbo...@web.de> wrote:
> Hm,
> thanks for the report.
> I don't have a high sierra box, but I can probably get one.
> t0050 -should- pass automagically, so I feel that I can do something.
> Unless someone is faster of course.
Sweet, thanks for taking a look.
> Is it possible that you run
> debug=t verbose=t ./t0050-filesystem.sh
> and send the output to me ?
Sure. First, though, note that I can make it pass (or at least "not
ok...TODO known breakage") with the following patch (may be
whitespace-damaged by gmail):
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 483c8d6d7..770b91f8c 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -1106,12 +1106,7 @@ test_lazy_prereq UTF8_NFD_TO_NFC '
auml=$(printf "\303\244")
aumlcdiar=$(printf "\141\314\210")
>"$auml" &&
- case "$(echo *)" in
- "$aumlcdiar")
- true ;;
- *)
- false ;;
- esac
+ stat "$aumlcdiar" >/dev/null 2>/dev/null
'
test_lazy_prereq AUTOIDENT '
I'm just worried there are bugs elsewhere in dealing with filesystems
like this that would need to be fixed and that this papers over them.
Anyway, the output you requested, at least for the last two failing tests, is:
expecting success:
git mv "$aumlcdiar" "$auml" &&
git commit -m rename
fatal: destination exists, source=ä, destination=ä
not ok 9 - rename (silent unicode normalization)
#
# git mv "$aumlcdiar" "$auml" &&
# git commit -m rename
#
expecting success:
git reset --hard initial &&
git merge topic
HEAD is now at 1b3caf6 initial
Updating 1b3caf6..2db1bf9
error: The following untracked working tree files would be overwritten by merge:
ä
Please move or remove them before you merge.
Aborting
not ok 10 - merge (silent unicode normalization)
#
# git reset --hard initial &&
# git merge topic
#
# still have 1 known breakage(s)
# failed 2 among remaining 9 test(s)
