Applying to trunk.
-- 8< --
Previously, if the common ancestor of the two paths is / we would print the
absolute second argument, but this PR asks for a relative path in that case
as well, which makes sense for the libstdc++.modules.json use case.
PR libstdc++/119081
contrib/ChangeLog:
* relpath.sh: Give relative path even at /.
---
contrib/relpath.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/contrib/relpath.sh b/contrib/relpath.sh
index ac6b769ef81..1b329fc04a7 100755
--- a/contrib/relpath.sh
+++ b/contrib/relpath.sh
@@ -59,9 +59,9 @@ while [ "${to#$from}" = "$to" ]; do
from=$(dirname $from);
back=../$back
- if [ "$from" = "/" ]; then
- echo $to
- exit 0
+ if [ "$from" = / ] && [ "${to#/}" = "$to" ]; then
+ echo no common ancestor between $1 and $2 >&2
+ exit 1
elif [ "$from" = . ]; then
echo no common ancestor between $1 and $2 >&2
exit 1
base-commit: 445128c12cf22081223f7385196ee3889ef4c4b2
--
2.48.1
