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`
This commit is contained in:
commit
0b5dc59c6b
@ -39,8 +39,7 @@ do
|
||||
shift
|
||||
done
|
||||
|
||||
cd_to_toplevel
|
||||
tmp=Documentation/tmp-doc-diff
|
||||
tmp="$(git rev-parse --show-toplevel)/Documentation/tmp-doc-diff" || exit 1
|
||||
|
||||
if test -n "$clean"
|
||||
then
|
||||
@ -109,7 +108,7 @@ render_tree () {
|
||||
make -j$parallel -C "$tmp/worktree" \
|
||||
GIT_VERSION=omitted \
|
||||
SOURCE_DATE_EPOCH=0 \
|
||||
DESTDIR="$PWD/$tmp/installed/$1+" \
|
||||
DESTDIR="$tmp/installed/$1+" \
|
||||
install-man &&
|
||||
mv "$tmp/installed/$1+" "$tmp/installed/$1"
|
||||
fi &&
|
||||
|
Loading…
Reference in New Issue
Block a user