Fix issue 41 #108
Open
Fix issue 41 #108
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Werkov added a commit to Werkov/git-deps that referenced this pull request Jul 4, 2024
New files in patch are shown as diff --git a/git_deps/blame.py b/git_deps/blame.py new file mode 100644 index 0000000..41d79fe --- /dev/null +++ b/git_deps/blame.py @@ -0,0 +1,61 @@ This is even visible in pygit2.Diff.patch. However, when you look at the same diff's pygit2.Patch.delta.old_file.path it is not '/dev/null' but 'git_deps/blame.py'. This could have been caught up by tree_lookup() in blame_diff_hunk if '/dev/null' was checked. Because old_file.path is a valid filename though, tree_lookup() may succeed. When? Consider case of moving a file and replacing it with a symlink: diff --git a/some-script b/some-script deleted file mode 100755 index 21c9f09..0000000 --- a/some-script +++ /dev/null @@ -1,3 +0,0 @@ <-- git-deps examines this hunk -#!/usr/bin/perl -... - diff --git a/some-script b/some-script new file mode 120000 index 0000000..0098051 --- /dev/null +++ b/some-script @@ -0,0 +1 @@ <-- this can be skipped, new file +newdir/some-script As a fix look at file mode of each Patch.delta's file and detect new files from old_file.mode, new files don't bring about any deps so they can be skipped in hunk examination. Fixes aspiers#41 Ref aspiers#108
Werkov added a commit to Werkov/git-deps that referenced this pull request Jul 4, 2024
New files in patch are shown as diff --git a/git_deps/blame.py b/git_deps/blame.py new file mode 100644 index 0000000..41d79fe --- /dev/null +++ b/git_deps/blame.py @@ -0,0 +1,61 @@ This is even visible in pygit2.Diff.patch. However, when you look at the same diff's pygit2.Patch.delta.old_file.path it is not '/dev/null' but 'git_deps/blame.py'. This could have been caught up by tree_lookup() in blame_diff_hunk if '/dev/null' was checked. Because old_file.path is a valid filename though, tree_lookup() may succeed. When? Consider case of moving a file and replacing it with a symlink: diff --git a/some-script b/some-script deleted file mode 100755 index 21c9f09..0000000 --- a/some-script +++ /dev/null @@ -1,3 +0,0 @@ <-- git-deps examines this hunk -#!/usr/bin/perl -... - diff --git a/some-script b/some-script new file mode 120000 index 0000000..0098051 --- /dev/null +++ b/some-script @@ -0,0 +1 @@ <-- this can be skipped, new file +newdir/some-script As a fix look at file mode of each Patch.delta's file and detect new files from old_file.mode, new files don't bring about any deps so they can be skipped in hunk examination. Without the fix crash like below happes: fatal: -L invalid line number: 0 subprocess.CalledProcessError: Command '['git', 'blame', '--porcelain', '-L', '0,+0', 'abcde', '--', 'some-script']' returned non-zero exit status 128. Fixes aspiers#41 Ref aspiers#108
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit. This suggestion is invalid because no changes were made to the code. Suggestions cannot be applied while the pull request is closed. Suggestions cannot be applied while viewing a subset of changes. Only one suggestion per line can be applied in a batch. Add this suggestion to a batch that can be applied as a single commit. Applying suggestions on deleted lines is not supported. You must change the existing code in this line in order to create a valid suggestion. Outdated suggestions cannot be applied. This suggestion has been applied or marked resolved. Suggestions cannot be applied from pending reviews. Suggestions cannot be applied on multi-line comments. Suggestions cannot be applied while the pull request is queued to merge. Suggestion cannot be applied right now. Please check back later.
Fix for issue 41.
Link here #41