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
[RFC] bisect: fix replay of CRLF logs #629
Conversation
Welcome to GitGitGadgetHi @chwarr, and welcome to GitGitGadget, the GitHub App to send patch series to the Git mailing list from GitHub Pull Requests. Please make sure that your Pull Request has a good description, as it will be used as cover letter. Also, it is a good idea to review the commit messages one last time, as the Git project expects them in a quite specific form:
It is in general a good idea to await the automated test ("Checks") in this Pull Request before contributing the patches, e.g. to avoid trivial issues such as unportable code. Contributing the patchesBefore you can contribute the patches, your GitHub username needs to be added to the list of permitted users. Any already-permitted user can do that, by adding a comment to your PR of the form Both the person who commented An alternative is the channel
Once on the list of permitted usernames, you can contribute the patches to the Git mailing list by adding a PR comment If you want to see what email(s) would be sent for a After you submit, GitGitGadget will respond with another comment that contains the link to the cover letter mail in the Git mailing list archive. Please make sure to monitor the discussion in that thread and to address comments and suggestions (while the comments and suggestions will be mirrored into the PR by GitGitGadget, you will still want to reply via mail). If you do not want to subscribe to the Git mailing list just to be able to respond to a mail, you can download the mbox from the Git mailing list archive (click the curl -g --user "<EMailAddress>:<Password>" \
--url "imaps://imap.gmail.com/INBOX" -T /path/to/raw.txt To iterate on your change, i.e. send a revised patch or patch series, you will first want to (force-)push to the same branch. You probably also want to modify your Pull Request description (or title). It is a good idea to summarize the revision by adding something like this to the cover letter (read: by editing the first comment on the PR, i.e. the PR description):
To send a new iteration, just add another PR comment with the contents: Need help?New contributors who want advice are encouraged to join git-mentoring@googlegroups.com, where volunteers who regularly contribute to Git are willing to answer newbie questions, give advice, or otherwise provide mentoring to interested contributors. You must join in order to post or view messages, but anyone can join. You may also be able to find help in real time in the developer IRC channel, |
/preview |
Error: User chwarr is not permitted to use GitGitGadget |
/allow |
User chwarr is now allowed to use GitGitGadget. WARNING: chwarr has no public email address set on GitHub |
/preview |
Preview email sent as pull.629.git.1588876116354.gitgitgadget@gmail.com |
Sometimes bisect logs have CRLF newlines. (E.g., if they've been edited on a Windows machine and their LF-only nature wasn't preserved.) Previously, such log files would cause odd failures deep in the guts of git bisect, like "?? what are you talking about?" or "couldn't get the oid of the rev '...?'" (notice the trailing ?) as each line's CR ends up part of the final value read from the log. This commit fixes that by stripping CRs from the log before further processing. A regression test that fails without the git-bisect.sh change, "bisect replay with CRLF log" has been added as well. Were anyone to intentionally be using terms/revs with embedded CRs, replaying such bisects will no longer work with this change. I suspect that this is incredibly rare. Signed-off-by: Christopher Warrington <chwarr@microsoft.com>
/preview |
Preview email sent as pull.629.git.1588883932717.gitgitgadget@gmail.com |
/preview |
Preview email sent as pull.629.git.1588886820215.gitgitgadget@gmail.com |
/submit |
Submitted as pull.629.git.1588886980377.gitgitgadget@gmail.com |
On the Git mailing list, Eric Sunshine wrote (reply to this):
|
On the Git mailing list, Jeff King wrote (reply to this):
|
On the Git mailing list, Junio C Hamano wrote (reply to this):
|
On the Git mailing list, Jeff King wrote (reply to this):
|
On the Git mailing list, Junio C Hamano wrote (reply to this):
|
On the Git mailing list, Junio C Hamano wrote (reply to this):
|
On the Git mailing list, Jeff King wrote (reply to this):
|
This branch is now known as |
This patch series was integrated into pu via git@10b0ad1. |
On the Git mailing list, Junio C Hamano wrote (reply to this):
|
This patch series was integrated into pu via git@eecdd12. |
This patch series was integrated into pu via git@f08de04. |
On the Git mailing list, "Christopher Warrington (CHRISTOPHER)" wrote (reply to this):
|
On the Git mailing list, Junio C Hamano wrote (reply to this):
|
On the Git mailing list, "brian m. carlson" wrote (reply to this):
|
On the Git mailing list, Achim Gratz wrote (reply to this):
|
This patch series was integrated into pu via git@930bf2d. |
This patch series was integrated into next via git@2eb0edf. |
This patch series was integrated into pu via git@cae899f. |
This patch series was integrated into pu via git@f9dbe28. |
This patch series was integrated into next via git@f9dbe28. |
This patch series was integrated into master via git@f9dbe28. |
Closed via f9dbe28. |
I recently ran into a problem replaying a bisect log that was created and
edited on a Windows machine. During the editing process, the log's LFs were
converted to CRLFs, which caused
git bisect replay
to fail. In myparticular case, the error from git version 2.26.2.windows.1 was "couldn't
get the oid of the rev '...?'" (notice the trailing ?).
I was able to reproduce this problem in the current
maint
branch,af6b65d (Git 2.26.2, 2020-04-19) on Ubuntu 18.04 as well.
This patch strips any CRs from the log during
git bisect replay
to avoidthese issues.
Is this change something that makes sense to add to Git itself?
I've opted to use
tr -d '\r'
to remove all CRs from the bisect log forsimplicity, but if there's a need to preserve CRs in the middle of log
lines, something like this will only remove a CR at the end of the line: