Skip to content

Commit 0b5dc59

Browse files
committed
Merge branch 'ma/doc-diff-usage-fix'
Running "Documentation/doc-diff x" from anywhere other than the top-level of the working tree did not show the usage string correctly, which has been fixed. * ma/doc-diff-usage-fix: doc-diff: don't `cd_to_toplevel`
2 parents 9c90dab + 2afe927 commit 0b5dc59

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

Documentation/doc-diff

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@ do
3939
shift
4040
done
4141

42-
cd_to_toplevel
43-
tmp=Documentation/tmp-doc-diff
42+
tmp="$(git rev-parse --show-toplevel)/Documentation/tmp-doc-diff" || exit 1
4443

4544
if test -n "$clean"
4645
then
@@ -109,7 +108,7 @@ render_tree () {
109108
make -j$parallel -C "$tmp/worktree" \
110109
GIT_VERSION=omitted \
111110
SOURCE_DATE_EPOCH=0 \
112-
DESTDIR="$PWD/$tmp/installed/$1+" \
111+
DESTDIR="$tmp/installed/$1+" \
113112
install-man &&
114113
mv "$tmp/installed/$1+" "$tmp/installed/$1"
115114
fi &&

0 commit comments

Comments
 (0)