undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ma/doc-diff-usage-fix'

Browse Source 
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:
Junio C Hamano 2019-02-06 22:05:29 -08:00
commit 0b5dc59c6b
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Documentation/doc-diff
View File

@ -39,8 +39,7 @@ do
shift shift
done done
cd_to_toplevel tmp="$(git rev-parse --show-toplevel)/Documentation/tmp-doc-diff" || exit 1
tmp=Documentation/tmp-doc-diff
if test -n "$clean" if test -n "$clean"
then then
@ -109,7 +108,7 @@ render_tree () {
make -j$parallel -C "$tmp/worktree" \ make -j$parallel -C "$tmp/worktree" \
GIT_VERSION=omitted \ GIT_VERSION=omitted \
SOURCE_DATE_EPOCH=0 \ SOURCE_DATE_EPOCH=0 \
DESTDIR="$PWD/$tmp/installed/$1+" \ DESTDIR="$tmp/installed/$1+" \
install-man && install-man &&
mv "$tmp/installed/$1+" "$tmp/installed/$1" mv "$tmp/installed/$1+" "$tmp/installed/$1"
fi && fi &&