| # Recover a broken release repository |
|
|
| The git repository in the workspace was left in a mess after a bad afternoon. |
| `main` currently has five commits, but the module `src/app.py` was deleted by the |
| `Drop legacy module` commit and nobody kept a copy. An experiment that was never |
| merged lives on as an unreachable commit whose message is `wip: plan`. |
|
|
| Fix the repository. When you are done it must satisfy all of the following. |
|
|
| ## 1. Restore the module |
|
|
| `src/app.py` must exist again with **exactly** the content it had in the commit |
| titled `Add config loader` (not the older `Initial import` version), and it must |
| be committed on `main` in a commit whose message is exactly: |
|
|
| ``` |
| restore app.py |
| ``` |
|
|
| ## 2. Rescue the abandoned experiment |
|
|
| Create a branch named `recovered` that points at the unreachable commit whose |
| message is `wip: plan`. That commit must **not** become an ancestor of `main`, |
| and it must still carry the work-in-progress version of `notes/plan.md`. |
|
|
| ## 3. Tag the release |
|
|
| Create an annotated-or-lightweight tag `v1.0` pointing at the commit titled |
| `Add config loader`. |
|
|
| ## 4. Ignore the junk, don't delete it |
|
|
| The workspace has two untracked artefacts, `debug.log` and `build/tmp.o`. Add a |
| `.gitignore` so that both are ignored, commit it, and leave the files on disk. |
|
|
| ## 5. Clean tree |
|
|
| `git status --porcelain` must print nothing. |
|
|
| ## Constraints |
|
|
| - Do not rewrite or discard the five existing commits on `main`; all five |
| original commit subjects must still be present in `git log main`. In |
| particular do not `reset` `main` backwards. |
| - Do not delete `debug.log` or `build/tmp.o`. |
| - No network access; everything you need is already in `.git`. |
|
|
