Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make compat/poll safer on Windows #64

Closed
wants to merge 1 commit into from

Conversation

dscho
Copy link
Member

@dscho dscho commented Oct 31, 2018

This is yet another piece from the Git for Windows cake. It avoids a wrap-around in the poll emulation on Windows that occurs every 49 days.

From Visual Studio 2015 Code Analysis: Warning C28159 Consider using
'GetTickCount64' instead of 'GetTickCount'.

Reason: GetTickCount() overflows roughly every 49 days. Code that does
not take that into account can loop indefinitely. GetTickCount64()
operates on 64 bit values and does not have that problem.

Note: this patch has been carried in Git for Windows for almost two
years, but with a fallback for Windows XP, as the GetTickCount64()
function is only available on Windows Vista and later. However, in the
meantime we require Vista or later, hence we can drop that fallback.

Signed-off-by: Steve Hoelzer <shoelzer@gmail.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho
Copy link
Member Author

dscho commented Oct 31, 2018

/submit

@gitgitgadget
Copy link

gitgitgadget bot commented Oct 31, 2018

Submitted as pull.64.git.gitgitgadget@gmail.com

Copy link
Member Author

dscho commented Nov 2, 2018

This branch is now known as sh/mingw-safer-compat-poll.

Copy link
Member Author

dscho commented Nov 2, 2018

This patch series was integrated into pu via git@def257e.

@dscho dscho added the pu label Nov 2, 2018 — with GitGitGadget
Copy link
Member Author

dscho commented Nov 5, 2018

This branch is now known as sh/mingw-safer-compat-poll.

Copy link
Member Author

dscho commented Nov 5, 2018

This patch series was integrated into pu via git@781541d.

Copy link
Member Author

dscho commented Nov 5, 2018

This patch series was integrated into next via git@933a940.

@dscho dscho added the next label Nov 5, 2018 — with GitGitGadget
Copy link
Member Author

dscho commented Dec 14, 2018

This branch is now known as sh/mingw-safer-compat-poll.

Copy link
Member Author

dscho commented Dec 14, 2018

This patch series was integrated into pu via git@1961efe.

Copy link
Member Author

dscho commented Dec 14, 2018

This patch series was integrated into next via git@1961efe.

Copy link
Member Author

dscho commented Dec 14, 2018

This patch series was integrated into master via git@1961efe.

@dscho dscho added the master label Dec 14, 2018 — with GitGitGadget
@dscho dscho closed this Dec 14, 2018
Copy link
Member Author

dscho commented Dec 14, 2018

Closed via 1961efe.

Copy link
Member Author

dscho commented Dec 14, 2018

This branch is now known as sh/mingw-safer-compat-poll.

Copy link
Member Author

dscho commented Dec 14, 2018

This patch series was integrated into pu via git@1961efe.

Copy link
Member Author

dscho commented Dec 14, 2018

This patch series was integrated into next via git@1961efe.

Copy link
Member Author

dscho commented Dec 14, 2018

This patch series was integrated into master via git@1961efe.

Copy link
Member Author

dscho commented Dec 14, 2018

Closed via 1961efe.

@dscho dscho deleted the mingw-safer-compat-poll branch December 14, 2018 20:54
@gitgitgadget

This comment has been minimized.

@gitgitgadget

This comment has been minimized.

@gitgitgadget

This comment has been minimized.

@gitgitgadget

This comment has been minimized.

@gitgitgadget

This comment has been minimized.

@gitgitgadget
Copy link

gitgitgadget bot commented Dec 15, 2018

This branch is now known as sh/mingw-safer-compat-poll.

@gitgitgadget
Copy link

gitgitgadget bot commented Dec 15, 2018

This patch series was integrated into maint via git@1961efe.

@gitgitgadget gitgitgadget bot added the maint label Dec 15, 2018
@gitgitgadget

This comment has been minimized.

@gitgitgadget

This comment has been minimized.

@gitgitgadget

This comment has been minimized.

dscho pushed a commit that referenced this pull request Feb 17, 2021
Both AsciiDoc and Asciidoctor are eager to pick up the e-mail addresses
in this document and turn them into references at the bottom of the
manpage / clickable links. We don't really need that for these dummy
addresses. Spell "@" as "&#64;" to make them not do this. In the open
block, we can instead avoid this by indenting the contents, similar to
the earlier blocks.

Fix a backtick which should have been a single quote mark. With all the
quoting that is going on around here, this mistake trips up the parsing
and rendering quite a bit.

Before this commit, we have the same failure mode with AsciiDoc 8.6.10
and Asciidoctor 1.5.5, and this change makes both of them happy.

Signed-off-by: Martin Ågren <martin.agren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
dscho pushed a commit that referenced this pull request Feb 19, 2021
Both AsciiDoc and Asciidoctor are eager to pick up the e-mail addresses
in this document and turn them into references at the bottom of the
manpage / clickable links. We don't really need that for these dummy
addresses. Spell "@" as "&#64;" to make them not do this. In the open
block, we can instead avoid this by indenting the contents, similar to
the earlier blocks.

Fix a backtick which should have been a single quote mark. With all the
quoting that is going on around here, this mistake trips up the parsing
and rendering quite a bit.

Before this commit, we have the same failure mode with AsciiDoc 8.6.10
and Asciidoctor 1.5.5, and this change makes both of them happy.

Signed-off-by: Martin Ågren <martin.agren@gmail.com>
Acked-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants