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.

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

Fix bug where colons in paths raise a ValueError on diff() calls. #1491

Merged
merged 1 commit into from
Sep 14, 2022
Merged

Fix bug where colons in paths raise a ValueError on diff() calls. #1491

merged 1 commit into from
Sep 14, 2022

Commits on Sep 13, 2022

  1. Fix bug where colons in paths raise a ValueError on diff() calls. 

    This commit introduces a potential fix for #1490 and #1483, in which an
`invalid literal for int() with base 10: 'n'` exception was raised
within a diff operation. Within `_handle_diff_line()`, we split the
output of `git diff-tree` on colons (`:` characters), under the
assumption that there are no colons within the paths of the files being
diffed. On POSIX systems this is not a valid assumption. The fix is to
split on `\x00:`, since a null character always precedes the colons we
actually need to split on.

A test already existed for this case (`test_diff_file_with_colon()`),
but it was marked as skipped.

* Split on `\x00:` instead of `:` in `_handle_diff_line()`.
* Unskip `test_diff_file_with_colon()`.
    @langfield
    langfield committed Sep 13, 2022
    Configuration menu
    Copy the full SHA
    db392ae View commit details
    Browse the repository at this point in the history