doc-diff: let `render_tree()` take an explicit directory name
In `render_tree()`, `$1` is documented to be the commit-ish/oid and we use it as that with `git checkout`, but we mostly use it to form the name of various directories. To separate these concerns, and because we are about to construct the directory names a bit differently, take two distinct arguments instead. Signed-off-by: Martin Ågren <martin.agren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Martin Ågren committed
Mar 17, 2019 at 19:36 UTC
bc71dc3fa1561c301098796b47cd7ef721cb68f9
1 file changed
+17
-11
Documentation/doc-diff
+17
-11
@@ -79,6 +79,9 @@ then
79
ln -s "$dots/config.mak" "$tmp/worktree/config.mak"
80
fi
81
82
+from_dir=$from_oid &&
83
+to_dir=$to_oid &&
84
+
85
# generate_render_makefile <srcdir> <dstdir>
86
generate_render_makefile () {
87
find "$1" -type f |
@@ -94,7 +97,7 @@ generate_render_makefile () {
97
done
98
}
99
97
-# render_tree <committish_oid>
100
+# render_tree <committish_oid> <directory_name>
101
render_tree () {
102
# Skip install-man entirely if we already have an installed directory.
103
# We can't rely on make here, since "install-man" unconditionally
@@ -102,28 +105,31 @@ render_tree () {
105
# we then can't rely on during the render step). We use "mv" to make
106
# sure we don't get confused by a previous run that failed partway
107
# through.
105
- if ! test -d "$tmp/installed/$1"
108
+ oid=$1 &&
109
+ dname=$2 &&
110
+ if ! test -d "$tmp/installed/$dname"
111
then
107
- git -C "$tmp/worktree" checkout --detach "$1" &&
112
+ git -C "$tmp/worktree" checkout --detach "$oid" &&
113
make -j$parallel -C "$tmp/worktree" \
114
GIT_VERSION=omitted \
115
SOURCE_DATE_EPOCH=0 \
111
- DESTDIR="$tmp/installed/$1+" \
116
+ DESTDIR="$tmp/installed/$dname+" \
117
install-man &&
113
- mv "$tmp/installed/$1+" "$tmp/installed/$1"
118
+ mv "$tmp/installed/$dname+" "$tmp/installed/$dname"
119
fi &&
120
121
# As with "installed" above, we skip the render if it's already been
122
# done. So using make here is primarily just about running in
123
# parallel.
119
- if ! test -d "$tmp/rendered/$1"
124
+ if ! test -d "$tmp/rendered/$dname"
125
then
121
- generate_render_makefile "$tmp/installed/$1" "$tmp/rendered/$1+" |
126
+ generate_render_makefile "$tmp/installed/$dname" \
127
+ "$tmp/rendered/$dname+" |
128
make -j$parallel -f - &&
123
- mv "$tmp/rendered/$1+" "$tmp/rendered/$1"
129
+ mv "$tmp/rendered/$dname+" "$tmp/rendered/$dname"
130
fi
131
}
132
127
-render_tree $from_oid &&
128
-render_tree $to_oid &&
129
-git -C $tmp/rendered diff --no-index "$@" $from_oid $to_oid
133
+render_tree $from_oid $from_dir &&
134
+render_tree $to_oid $to_dir &&
135
+git -C $tmp/rendered diff --no-index "$@" $from_dir $to_dir