| commit | 97f9158ff1c6468a2c80a195ed39dd5ee0ae600d | |
| author | Stefan Sperling <stsp@stsp.name> | |
| Fri, 25 Aug 2023 11:26:02 +0000 (25 11:26 +0000) | ||
| committer | Thomas Adam <thomas@xteddy.org> | |
| Tue, 29 Aug 2023 16:20:40 +0000 (29 17:20 +0100) | ||
| tree | 9f53329266f43b8c399749742e02be64b9146c7d | treesnapshot (tar.gz zip) |
| parent | 720b08bca9347796473f8c8c4c6a1f43df62c320 | commitdiff |
fix deletion of missing locally-added files
If a locally added file in A status gets deleted from disk it will
move into missing ! status. If the user then decides to delete the
file we must remove the file index entry immediately rather than
flagging the file for removal during the next commit operation.
The file was never committed and lacks a base-blob and base-commit,
so it cannot be removed during the next commit. As a result the
commit operation was reporting a bogus "out of date" error.
Found while diagnosing a related bug reported by gonzalo@
ok op@
If a locally added file in A status gets deleted from disk it will
move into missing ! status. If the user then decides to delete the
file we must remove the file index entry immediately rather than
flagging the file for removal during the next commit operation.
The file was never committed and lacks a base-blob and base-commit,
so it cannot be removed during the next commit. As a result the
commit operation was reporting a bogus "out of date" error.
Found while diagnosing a related bug reported by gonzalo@
ok op@
| lib/worktree.c | diffblobblamehistory |