Bug 552636 - Some files not refreshed after interactive rebase
Summary: Some files not refreshed after interactive rebase
Status: RESOLVED FIXED
Alias: None
Product: JGit
Classification: Technology
Component: JGit (show other bugs)
Version: 5.6   Edit
Hardware: PC Mac OS X
: P3 normal (vote)
Target Milestone: 5.6   Edit
Assignee: Thomas Wolf CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2019-11-02 07:58 EDT by Thomas Wolf CLA
Modified: 2019-11-03 15:45 EST (History)
1 user (show)

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Thomas Wolf CLA 2019-11-02 07:58:16 EDT 
Noticed several times now: after an interactive rebase of multiple commits some files are not present in the package explorer in the end. Mostly affects new files (added in some commit in a series), but I've seen it also for one modified file. If the missing file is a Java source referenced in other classes there are Java compilation errors. A manual refresh resolves the problem. "Refresh on access" is set for the workspace.

Probably related to https://git.eclipse.org/r/#/c/150032/ . Either JGit forgets to include some files in the WorkingTreeModifiedEvent, or EGit's processing of that event is flawed.

OS X 10.14.4

EGit 5.6.0.201911012245
JGit 5.6.0.201910302341
Comment 1 Thomas Wolf CLA 2019-11-02 08:15:49 EDT 
Might be related to using "Fixup". Top commit moved back in the history, say to be just on top of the first commit, set to "fixup", then run the rebase. (Which applies without conflicts.)
Comment 2 Thomas Wolf CLA 2019-11-02 08:37:45 EDT 
Though a simple "Reword" shows the same problem.
Comment 3 Thomas Wolf CLA 2019-11-02 08:43:26 EDT 
Reproducer using the EGit repo:

1. check out https://git.eclipse.org/r/#/c/151822/ from Gerrit
2. In the history page, choose "Reword" on the commit with message "[repo groups] move to own package"

Result: file MessagePopupTextCellEditor (added in a later commit with message "[repo groups] inline renaming of repository groups") is not refreshed; Java compilation errors in the workspace.
Comment 4 Thomas Wolf CLA 2019-11-02 14:26:07 EDT 
This is a bug in JGit. EGit never gets any WorkingTreeModifiedEvent including the file.
Comment 5 Eclipse Genie CLA 2019-11-02 15:21:05 EDT 
New Gerrit change created: https://git.eclipse.org/r/151910
Comment 6 Eclipse Genie CLA 2019-11-03 15:44:47 EST 
Gerrit change https://git.eclipse.org/r/151910 was merged to [master].
Commit: http://git.eclipse.org/c/jgit/jgit.git/commit/?id=64f2407f19330d182728feeaf3d2c1a4092a2051