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

Ignore empty info in diff line #1497

Merged

Byron merged 1 commit into gitpython-developers:main from dwapstra:git_diff_empty

Sep 27, 2022

Contributor

dwapstra commented Sep 27, 2022

In some cases, the git diff command does not return any output, this results in an exception in the diff line handling code.

  File "../lib/python3.8/site-packages/git/diff.py", line 502, in _handle_diff_line
    old_mode, new_mode, a_blob_id, b_blob_id, _change_type = meta.split(None, 4)
ValueError: not enough values to unpack (expected 5, got 1)

This fix ignores empty diff lines.


          Ignore empty info in diff line

41003c5

Byron added this to the v3.1.28 - Bugfixes milestone

Member

Byron commented Sep 27, 2022

Thanks a lot. This is probably an example for 'the perfect PR': Bite-sized, with concise description, and CI is happy, too :).

Byron merged commit 0d28eaa into gitpython-developers:main

dwapstra deleted the git_diff_empty branch

September 28, 2022 18:42

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment