Skip to content

amend: Fix last-touched when deleting files - #276

Merged
jerry-skydio merged 1 commit into
mainfrom
jerry/revup/main/deletelasttouched
Jul 27, 2026
Merged

amend: Fix last-touched when deleting files#276
jerry-skydio merged 1 commit into
mainfrom
jerry/revup/main/deletelasttouched

Conversation

@jerry-skydio

Copy link
Copy Markdown
Collaborator

Previously deleted files were not affected by this replay
logic because they don't show up in the new index.

Fix this by adding the old version of the deleted file to
the base of the merge, so the merge-tree will treat it as
deleted. Add a test for this.

@jerry-skydio

jerry-skydio commented Jul 23, 2026

Copy link
Copy Markdown
Collaborator Author

Reviews in this chain:
#276 amend: Fix last-touched when deleting files
 └#284 git: Use -z for null separated parsing

@jerry-skydio

jerry-skydio commented Jul 23, 2026

Copy link
Copy Markdown
Collaborator Author
# head base diff date summary
0 e70a81fe d9e4421c diff Jul 23 16:01 PM 3 files changed, 69 insertions(+), 11 deletions(-)
1 f5bb77dd f3120035 rebase Jul 27 13:47 PM 0 files changed
2 fa73cdf5 d6fce997 diff Jul 27 13:52 PM 3 files changed, 8 insertions(+), 37 deletions(-)
3 258238bd fa6fd31b diff Jul 27 13:54 PM 1 file changed, 20 deletions(-)

@jerry-skydio
jerry-skydio force-pushed the jerry/revup/main/fixlasttouched branch from d9e4421 to f312003 Compare July 27, 2026 20:47
@jerry-skydio
jerry-skydio force-pushed the jerry/revup/main/deletelasttouched branch 2 times, most recently from b23066b to fa73cdf Compare July 27, 2026 20:52
@jerry-skydio
jerry-skydio force-pushed the jerry/revup/main/fixlasttouched branch from f312003 to d6fce99 Compare July 27, 2026 20:52
Base automatically changed from jerry/revup/main/fixlasttouched to main July 27, 2026 20:54
Previously deleted files were not affected by this replay
logic because they don't show up in the new index.

Fix this by adding the old version of the deleted file to
the base of the merge, so the merge-tree will treat it as
deleted. Add a test for this.
@jerry-skydio
jerry-skydio force-pushed the jerry/revup/main/deletelasttouched branch from fa73cdf to 258238b Compare July 27, 2026 20:54
@jerry-skydio
jerry-skydio merged commit 792fbe9 into main Jul 27, 2026
6 checks passed
@jerry-skydio
jerry-skydio deleted the jerry/revup/main/deletelasttouched branch July 27, 2026 20:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants