Skip to content

Commit

Permalink
Merge branch 'js/git-version-gen-update' into next
Browse files Browse the repository at this point in the history
Build regression fix.

* js/git-version-gen-update:
  GIT-VERSION-GEN: allow it to be run in parallel
  • Loading branch information
gitster committed Jan 10, 2025
2 parents 9b8f84e + 64f3ff3 commit e4c4bf6
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions GIT-VERSION-GEN
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit e4c4bf6

Please sign in to comment.