summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.mailmap1
-rwxr-xr-xtests/cp/fail-perm.sh2
-rwxr-xr-xtests/ln/hard-to-sym.sh2
3 files changed, 3 insertions, 2 deletions
diff --git a/.mailmap b/.mailmap
index 8b6231763..dcabcb534 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,4 +1,5 @@
# Map git author names and email addresses to canonical/preferred form.
+<jim@meyering.net> <meyering@fb.com>
<jim@meyering.net> <meyering@iou.iou>
<jim@meyering.net> <meyering@redhat.com>
<jim@meyering.net> <meyering@rho.meyering.net>
diff --git a/tests/cp/fail-perm.sh b/tests/cp/fail-perm.sh
index 29c119bad..8665449a8 100755
--- a/tests/cp/fail-perm.sh
+++ b/tests/cp/fail-perm.sh
@@ -38,7 +38,7 @@ chmod 0 D
ln -s D/D symlink
touch F
cat > exp <<\EOF
-cp: accessing 'symlink': Permission denied
+cp: failed to access 'symlink': Permission denied
EOF
cp F symlink 2> out && fail=1
diff --git a/tests/ln/hard-to-sym.sh b/tests/ln/hard-to-sym.sh
index bfe4270b9..26de099a7 100755
--- a/tests/ln/hard-to-sym.sh
+++ b/tests/ln/hard-to-sym.sh
@@ -53,7 +53,7 @@ esac
ln -s /no-such-dir || framework_failure_
ln -L no-such-dir hard-to-dangle 2>err && fail=1
case $(cat err) in
- *" accessing 'no-such-dir'":*) ;;
+ *" failed to access 'no-such-dir'":*) ;;
*) fail=1 ;;
esac
ln -P no-such-dir hard-to-dangle || fail=1