commit 290d31c68ae19f0e7bece99118a3279f27a2d0d458447c3c19f3b69bd031838c from: Stefan Sperling date: Mon Jan 20 11:03:02 2025 UTC skip full content comparison in 'got status' if file sizes differ Speeds up 'got status' in work trees that contain large files which are modified. This change exposes bugs in 'got revert' which now manifest as test failures. One bug where the size recorded in the file index is not updated during revert, and another where a wrong base commit is recorded in the file index entry during revert. Fix those bugs, too. ok jamsek commit - 0873c75d39a9cb3e01d3d6a586d5eefe2fed92320c3f42e79e266a1c7ea72edd commit + 290d31c68ae19f0e7bece99118a3279f27a2d0d458447c3c19f3b69bd031838c blob - 55d256d57586ca119a0e22fec2f2f01597de7e0c0d4b6b1d3e7f1e687427fc87 blob + 4af194792ff6ce9153fbf7f99ed5579dc0d5150f3e7dceb04dda9c350b24bcd1 --- lib/worktree.c +++ lib/worktree.c @@ -1839,8 +1839,22 @@ get_file_status(unsigned char *status, struct stat *sb goto done; } fd = -1; + + if (staged_status == GOT_STATUS_NO_CHANGE && + S_ISREG(sb->st_mode) && + got_fileindex_entry_filetype_get(ie) == + GOT_FILEIDX_MODE_REGULAR_FILE && + ie->size != (sb->st_size & 0xffffffff)) { + /* + * The size of regular files differs. We can skip the full + * content comparison loop below but still need to check + * for conflict markers. + */ + *status = GOT_STATUS_MODIFY; + } + hdrlen = got_object_blob_get_hdrlen(blob); - for (;;) { + while (*status == GOT_STATUS_NO_CHANGE) { const uint8_t *bbuf = got_object_blob_get_read_buf(blob); err = got_object_blob_read_block(&blen, blob); if (err) @@ -5355,6 +5369,11 @@ revert_file(void *arg, unsigned char status, unsigned goto done; } } + err = got_fileindex_entry_update(ie, + a->worktree->root_fd, relpath, + &blob->id, &ie->commit, 0); + if (err) + goto done; } else { int is_bad_symlink = 0; if (te && S_ISLNK(te->mode)) { @@ -5372,14 +5391,11 @@ revert_file(void *arg, unsigned char status, unsigned } if (err) goto done; - if (status == GOT_STATUS_DELETE || - status == GOT_STATUS_MODE_CHANGE) { - err = got_fileindex_entry_update(ie, - a->worktree->root_fd, relpath, - &blob->id, a->worktree->base_commit_id, 1); - if (err) - goto done; - } + err = got_fileindex_entry_update(ie, + a->worktree->root_fd, relpath, + &blob->id, &ie->commit, 0); + if (err) + goto done; if (is_bad_symlink) { got_fileindex_entry_filetype_set(ie, GOT_FILEIDX_MODE_BAD_SYMLINK);