summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-02-07 06:05:29 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-02-07 06:05:30 (GMT)
commit0b5dc59c6b5bea37a425f84e64cd33cd0694a46d (patch)
tree3c9dfab2c90d39bbe982aae2f7607e3d974c38c9
parent9c90dab1b029e2e9a2709f59d808ce4a27d14d53 (diff)
parent2afe9278a2c1930538ea465955174abf82def3e5 (diff)
downloadgit-0b5dc59c6b5bea37a425f84e64cd33cd0694a46d.zip
git-0b5dc59c6b5bea37a425f84e64cd33cd0694a46d.tar.gz
git-0b5dc59c6b5bea37a425f84e64cd33cd0694a46d.tar.bz2
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`
-rwxr-xr-xDocumentation/doc-diff5
1 files changed, 2 insertions, 3 deletions
diff --git a/Documentation/doc-diff b/Documentation/doc-diff
index dfd9418..32c83dd 100755
--- a/Documentation/doc-diff
+++ b/Documentation/doc-diff
@@ -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 &&