Repository navigation
Conversation
mkllnk
requested changes
May 24, 2026
mkllnk
left a comment
mkllnk
left a comment
Member
There was a problem hiding this comment.
Thank you for this contribution. I think that it can be simplified. I know that it has been a really long time now but would you like to try to improve it? Covering this case with a test would be great as well.
Comment on lines
+826
to
+835
| # Remove files from the upload list that are also scheduled for delete | ||
| if [ -s "$TMP_GITFTP_DELETE" ] && [ -s "$TMP_GITFTP_UPLOAD" ]; then | ||
| local TMP_GITFTP_FILTERED=$(mktemp) | ||
| while IFS= read -r -d '' FILE_NAME; do | ||
| if ! grep -zF -- "$FILE_NAME" "$TMP_GITFTP_DELETE" >/dev/null 2>&1; then | ||
| printf '%s\0' "$FILE_NAME" >> "$TMP_GITFTP_FILTERED" | ||
| fi | ||
| done < "$TMP_GITFTP_UPLOAD" | ||
| mv "$TMP_GITFTP_FILTERED" "$TMP_GITFTP_UPLOAD" | ||
| fi |
Member
There was a problem hiding this comment.
This probably works but grep can do most of this for you. Here's an example:
# given lines a, b and c in file abc and
# given lnes b c and d in file bcd
$ grep -v -F -f abc bcd
d
So I think that this logic should work here:
grep -v -F -f "$TMP_GITFTP_DELETE" "$TMP_GITFTP_UPLOAD" > "$TMP_GITFTP_FILTERED"
This branch has not been deployed
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Prevent uploading files that are both in the upload buffer and the delete list (occurs when a file is created then deleted between commits)
Fix: After sorting change lists, remove entries from the upload list that also appear in the delete list so the upload buffer never tries to send deleted files
#655