IJHack / QtPass / 34832072539

93%

push

github

Backport: keep untracked files out of backup commit, stage .gpg-id in Init (#1709) (#1713)

* Keep untracked files out of the re-encryption backup commit (#1682) (#1685)

ImitatePass::createBackupCommit() checked `git status --porcelain` and,
when anything showed up, ran `git add -A` before committing. Both steps
include untracked files, so any stray file sitting in the password store
(a plaintext export, an editor swap file, a scratch note) was swept into
the "Backup before re-encryption" commit and, with autoPush enabled,
pushed to the shared remote without the user ever being asked.

Restrict both steps to files git already tracks: the status check now
uses `--untracked-files=no` and the staging step uses `git add -u`. The
backup still snapshots hand-edited tracked files (for example .gpg-id)
before the per-file re-encryption commits, and a store whose only
changes are untracked files no longer produces a backup commit at all.

Add two regression tests to tst_util that drive createBackupCommit()
against a throwaway git repository: one asserts a modified tracked file
is committed while an untracked export.txt stays untracked, the other
asserts that an untracked swap file alone yields no commit. Both fail on
the previous code.

Claude-Session: https://claude.ai/code/session_01JuQsrHonihp1nARE7bzstc

Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
(cherry picked from commit c6bb3d9da)

* Follow-up to #1685: stage an untracked .gpg-id in ImitatePass::Init (#1698)

MainWindow::addFolder (#1688) writes a folder's .gpg-id straight to disk
without staging it. Before #1685 the `git add -A` in createBackupCommit
swept that file into the backup commit as a side effect; now the backup
only takes tracked files, so nothing in QtPass ever committed it.

ImitatePass::Init decided whether to `git add` the .gpg-id from
QFileInfo::exists. For an untracked-but-present file it skipped the add,
`git commit -- <dir>/.gpg-id` failed... (continued)

33 of 36 new or added lines in 1 file covered. (91.67%)

4719 of 7250 relevant lines covered (65.09%)

62.31 hits per line