Skip to content

txtar: handle crlf line endings #595

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.

Sign up for GitHub

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

Jump to bottom
Closed
paskozdilar wants to merge 1 commit into from
Closed

txtar: handle crlf line endings #595

paskozdilar wants to merge 1 commit into from

Conversation

@paskozdilar
Copy link
Contributor

@paskozdilar paskozdilar commented Sep 25, 2025 •
edited
Loading

Function isMarker detects a file marker line by checking if the data before
the first '\n' has a marker prefix and suffix.
In the case of CRLF line endings, the data before the first '\n' ends with
'\r', so the suffix check fails.

Here, '\r' is trimmed before checking the suffix.

Fixes golang/go#59264.
@paskozdilar paskozdilar force-pushed the txtar-handle-crlf-line-endings branch from 3c0fd10 to c4ff229 Compare September 25, 2025 10:52
@gopherbot
Copy link
Contributor

gopherbot commented Sep 25, 2025

This PR (HEAD: c4ff229) has been imported to Gerrit for code review.

Please visit Gerrit at https://go-review.googlesource.com/c/tools/+/706676.

Important tips:

  • Don't comment on this PR. All discussion takes place in Gerrit.
  • You need a Gmail or other Google account to log in to Gerrit.
  • To change your code in response to feedback:
    • Push a new commit to the branch used by your GitHub PR.
    • A new "patch set" will then appear in Gerrit.
    • Respond to each comment by marking as Done in Gerrit if implemented as suggested. You can alternatively write a reply.
    • Critical: you must click the blue Reply button near the top to publish your Gerrit responses.
    • Multiple commits in the PR will be squashed by GerritBot.
  • The title and description of the GitHub PR are used to construct the final commit message.
    • Edit these as needed via the GitHub web interface (not via Gerrit or git).
    • You should word wrap the PR description at ~76 characters unless you need longer lines (e.g., for tables or URLs).
  • See the Sending a change via GitHub and Reviews sections of the Contribution Guide as well as the FAQ for details.
@gopherbot
Copy link
Contributor

gopherbot commented Sep 25, 2025

Message from Gopher Robot:

Patch Set 1:

(1 comment)

Please don’t reply on this GitHub thread. Visit golang.org/cl/706676.
After addressing review feedback, remember to publish your drafts!
@paskozdilar paskozdilar force-pushed the txtar-handle-crlf-line-endings branch from c4ff229 to 111e911 Compare September 25, 2025 11:55
@gopherbot
Copy link
Contributor

gopherbot commented Sep 25, 2025

This PR (HEAD: 111e911) has been imported to Gerrit for code review.

Please visit Gerrit at https://go-review.googlesource.com/c/tools/+/706676.

Important tips:

  • Don't comment on this PR. All discussion takes place in Gerrit.
  • You need a Gmail or other Google account to log in to Gerrit.
  • To change your code in response to feedback:
    • Push a new commit to the branch used by your GitHub PR.
    • A new "patch set" will then appear in Gerrit.
    • Respond to each comment by marking as Done in Gerrit if implemented as suggested. You can alternatively write a reply.
    • Critical: you must click the blue Reply button near the top to publish your Gerrit responses.
    • Multiple commits in the PR will be squashed by GerritBot.
  • The title and description of the GitHub PR are used to construct the final commit message.
    • Edit these as needed via the GitHub web interface (not via Gerrit or git).
    • You should word wrap the PR description at ~76 characters unless you need longer lines (e.g., for tables or URLs).
  • See the Sending a change via GitHub and Reviews sections of the Contribution Guide as well as the FAQ for details.
@paskozdilar paskozdilar force-pushed the txtar-handle-crlf-line-endings branch from 111e911 to dc8e29d Compare September 25, 2025 11:59
@gopherbot
Copy link
Contributor

gopherbot commented Sep 25, 2025

This PR (HEAD: dc8e29d) has been imported to Gerrit for code review.

Please visit Gerrit at https://go-review.googlesource.com/c/tools/+/706676.

Important tips:

  • Don't comment on this PR. All discussion takes place in Gerrit.
  • You need a Gmail or other Google account to log in to Gerrit.
  • To change your code in response to feedback:
    • Push a new commit to the branch used by your GitHub PR.
    • A new "patch set" will then appear in Gerrit.
    • Respond to each comment by marking as Done in Gerrit if implemented as suggested. You can alternatively write a reply.
    • Critical: you must click the blue Reply button near the top to publish your Gerrit responses.
    • Multiple commits in the PR will be squashed by GerritBot.
  • The title and description of the GitHub PR are used to construct the final commit message.
    • Edit these as needed via the GitHub web interface (not via Gerrit or git).
    • You should word wrap the PR description at ~76 characters unless you need longer lines (e.g., for tables or URLs).
  • See the Sending a change via GitHub and Reviews sections of the Contribution Guide as well as the FAQ for details.
@gopherbot
Copy link
Contributor

gopherbot commented Sep 25, 2025

Message from Paško Zdilar:

Patch Set 2:

(1 comment)

Please don’t reply on this GitHub thread. Visit golang.org/cl/706676.
After addressing review feedback, remember to publish your drafts!
@paskozdilar paskozdilar force-pushed the txtar-handle-crlf-line-endings branch from dc8e29d to 336ddb7 Compare September 25, 2025 17:41
@gopherbot
Copy link
Contributor

gopherbot commented Sep 25, 2025

This PR (HEAD: 336ddb7) has been imported to Gerrit for code review.

Please visit Gerrit at https://go-review.googlesource.com/c/tools/+/706676.

Important tips:

  • Don't comment on this PR. All discussion takes place in Gerrit.
  • You need a Gmail or other Google account to log in to Gerrit.
  • To change your code in response to feedback:
    • Push a new commit to the branch used by your GitHub PR.
    • A new "patch set" will then appear in Gerrit.
    • Respond to each comment by marking as Done in Gerrit if implemented as suggested. You can alternatively write a reply.
    • Critical: you must click the blue Reply button near the top to publish your Gerrit responses.
    • Multiple commits in the PR will be squashed by GerritBot.
  • The title and description of the GitHub PR are used to construct the final commit message.
    • Edit these as needed via the GitHub web interface (not via Gerrit or git).
    • You should word wrap the PR description at ~76 characters unless you need longer lines (e.g., for tables or URLs).
  • See the Sending a change via GitHub and Reviews sections of the Contribution Guide as well as the FAQ for details.
@gopherbot
Copy link
Contributor

gopherbot commented Sep 28, 2025

Message from Sean Liao:

Patch Set 4: Code-Review+1 Commit-Queue+1

(3 comments)

Please don’t reply on this GitHub thread. Visit golang.org/cl/706676.
After addressing review feedback, remember to publish your drafts!
@gopherbot
Copy link
Contributor

gopherbot commented Sep 28, 2025

Message from Go LUCI:

Patch Set 4:

Dry run: CV is trying the patch.

Bot data: {"action":"start","triggered_at":"2025-09-28T19:12:13Z","revision":"6bdb8cd44bcd04cf1ba3bdd63608d24542c100ba"}

Please don’t reply on this GitHub thread. Visit golang.org/cl/706676.
After addressing review feedback, remember to publish your drafts!
@gopherbot
Copy link
Contributor

gopherbot commented Sep 28, 2025

Message from Sean Liao:

Patch Set 4: -Commit-Queue

Please don’t reply on this GitHub thread. Visit golang.org/cl/706676.
After addressing review feedback, remember to publish your drafts!
@gopherbot
Copy link
Contributor

gopherbot commented Sep 28, 2025

Message from Go LUCI:

Patch Set 4:

This CL has passed the run

Please don’t reply on this GitHub thread. Visit golang.org/cl/706676.
After addressing review feedback, remember to publish your drafts!
@gopherbot
Copy link
Contributor

gopherbot commented Sep 28, 2025

Message from Go LUCI:

Patch Set 4: LUCI-TryBot-Result+1

Please don’t reply on this GitHub thread. Visit golang.org/cl/706676.
After addressing review feedback, remember to publish your drafts!
@paskozdilar
txtar: handle crlf line endings
69a9348 
Function isMarker detects a file marker line by checking if the data before
the first '\n' has a marker prefix and suffix.
In the case of CRLF line endings, the data before the first '\n' ends with
'\r', so the suffix check fails.

Here, '\r' is trimmed before checking the suffix.

Fixes golang/go#59264.
@paskozdilar paskozdilar force-pushed the txtar-handle-crlf-line-endings branch from 336ddb7 to 69a9348 Compare September 28, 2025 20:16
@gopherbot
Copy link
Contributor

gopherbot commented Sep 28, 2025

This PR (HEAD: 69a9348) has been imported to Gerrit for code review.

Please visit Gerrit at https://go-review.googlesource.com/c/tools/+/706676.

Important tips:

  • Don't comment on this PR. All discussion takes place in Gerrit.
  • You need a Gmail or other Google account to log in to Gerrit.
  • To change your code in response to feedback:
    • Push a new commit to the branch used by your GitHub PR.
    • A new "patch set" will then appear in Gerrit.
    • Respond to each comment by marking as Done in Gerrit if implemented as suggested. You can alternatively write a reply.
    • Critical: you must click the blue Reply button near the top to publish your Gerrit responses.
    • Multiple commits in the PR will be squashed by GerritBot.
  • The title and description of the GitHub PR are used to construct the final commit message.
    • Edit these as needed via the GitHub web interface (not via Gerrit or git).
    • You should word wrap the PR description at ~76 characters unless you need longer lines (e.g., for tables or URLs).
  • See the Sending a change via GitHub and Reviews sections of the Contribution Guide as well as the FAQ for details.
@gopherbot
Copy link
Contributor

gopherbot commented Sep 28, 2025

Message from Paško Zdilar:

Patch Set 5:

(3 comments)

Please don’t reply on this GitHub thread. Visit golang.org/cl/706676.
After addressing review feedback, remember to publish your drafts!
@gopherbot
Copy link
Contributor

gopherbot commented Sep 28, 2025

Message from Sean Liao:

Patch Set 5: Auto-Submit+1 Code-Review+2

Please don’t reply on this GitHub thread. Visit golang.org/cl/706676.
After addressing review feedback, remember to publish your drafts!
@gopherbot
Copy link
Contributor

gopherbot commented Sep 30, 2025

Message from Michael Matloob:

Patch Set 5: Code-Review+1

Please don’t reply on this GitHub thread. Visit golang.org/cl/706676.
After addressing review feedback, remember to publish your drafts!
@gopherbot
Copy link
Contributor

gopherbot commented Sep 30, 2025

Message from Michael Matloob:

Patch Set 5: Code-Review+2

Please don’t reply on this GitHub thread. Visit golang.org/cl/706676.
After addressing review feedback, remember to publish your drafts!
gopherbot pushed a commit that referenced this pull request Sep 30, 2025
@paskozdilar @gopherbot
txtar: handle crlf line endings
2aea3dc 
Function isMarker detects a file marker line by checking if the data before
the first '\n' has a marker prefix and suffix.
In the case of CRLF line endings, the data before the first '\n' ends with
'\r', so the suffix check fails.

Here, '\r' is trimmed before checking the suffix.

Fixes golang/go#59264.

Change-Id: I030357915abaa61f492b9d3d81a7edbd5d09d78e
GitHub-Last-Rev: 69a9348
GitHub-Pull-Request: #595
Reviewed-on: https://go-review.googlesource.com/c/tools/+/706676
Reviewed-by: Sean Liao <sean@liao.dev>
Reviewed-by: Michael Matloob <matloob@golang.org>
Auto-Submit: Sean Liao <sean@liao.dev>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Michael Matloob <matloob@google.com>
Reviewed-by: Carlos Amedee <carlos@golang.org>
@gopherbot
Copy link
Contributor

gopherbot commented Sep 30, 2025

This PR is being closed because golang.org/cl/706676 has been merged.
@gopherbot gopherbot closed this Sep 30, 2025
@paskozdilar paskozdilar deleted the txtar-handle-crlf-line-endings branch October 1, 2025 10:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

2 participants

@paskozdilar @gopherbot