summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2025-01-10 09:19:33 -0800
committerJunio C Hamano <gitster@pobox.com>2025-01-10 09:19:33 -0800
commit3ae35648bfc135e212c787f25caaed92ea7e0084 (patch)
treebe319beed7522ab973f64b52b6b16508a3f63c93
parenta60673e9252b08d4eca90543b3729f4798b9aafd (diff)
parent64f3ff3ffcfed10b8b5bf42cda3fc19776fb29f2 (diff)
Merge branch 'js/git-version-gen-update'
Build regression fix. * js/git-version-gen-update: GIT-VERSION-GEN: allow it to be run in parallel
-rwxr-xr-xGIT-VERSION-GEN8
1 files changed, 4 insertions, 4 deletions
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 6d1cb66d69..2e2d081158 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -86,11 +86,11 @@ sed -e "s|@GIT_VERSION@|$GIT_VERSION|" \
-e "s|@GIT_BUILT_FROM_COMMIT@|$GIT_BUILT_FROM_COMMIT|" \
-e "s|@GIT_USER_AGENT@|$GIT_USER_AGENT|" \
-e "s|@GIT_DATE@|$GIT_DATE|" \
- "$INPUT" >"$OUTPUT"+
+ "$INPUT" >"$OUTPUT".$$+
-if ! test -f "$OUTPUT" || ! cmp "$OUTPUT"+ "$OUTPUT" >/dev/null
+if ! test -f "$OUTPUT" || ! cmp "$OUTPUT".$$+ "$OUTPUT" >/dev/null
then
- mv "$OUTPUT"+ "$OUTPUT"
+ mv "$OUTPUT".$$+ "$OUTPUT"
else
- rm "$OUTPUT"+
+ rm "$OUTPUT".$$+
fi