• Home
  • Features
  • Pricing
  • Docs
  • Announcements
  • Sign In

IJHack / QtPass / 43607343846
96%

Build:
DEFAULT BRANCH: main
Ran 14 Nov 2026 03:08PM UTC
Jobs 1
Files 87
Run time 1min
Badge
Embed ▾
README BADGES
x

If you need to use a raster PNG badge, change the '.svg' to '.png' in the link

Markdown

Textile

RDoc

HTML

Rst

14 Nov 2026 02:54PM UTC coverage: 96.325% (+0.004%) from 96.321%
43607343846

push

github

web-flow
Re-encryption: refuse a backup commit over unmerged files, and translate the new Git messages (#2161)

* Re-encryption: refuse a backup commit over unmerged files

The checks for an unfinished Git operation look for its markers
(MERGE_HEAD, a rebase directory, the sequencer), and pullBeforeReencrypt()
looks for unmerged files only after a failed automatic pull. A `git stash
pop` that conflicted leaves unmerged files and none of those markers, so
with automatic pull off, Users → OK reached createBackupCommit(): its
`git add -u` recorded the work tree, conflict markers and all, as the
resolution, and the backup commit was pushed.

createBackupCommit() now reads the `git status --porcelain` output it
already fetches and refuses when it lists an unmerged path (DD, AU, UD, UA,
DU, AA or UU), with the same "Unfinished Git operation" dialog as the other
refusals. The repository-wide status rather than `ls-files --unmerged`,
which stops at the store's folder while `add -u` stages a repository above
the store as a whole.

Test reencryptRefusesToCommitAStashPopConflict makes a real stash-pop
conflict, checks that no MERGE_HEAD exists, and asserts the refusal, no new
commit, the conflict still in the index and no gpg encrypt. It fails with
the check disabled.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Signed-off-by: Anne Jan Brouwer <brouwer@annejan.com>

* chore: update localization source references

make lupdate for the strings #2154, #2156 and the previous commit added
(unfinished Git operation, pull in progress, unmerged files) and a pwgen
error, 13 per locale; the rest is line numbers moved by the Doxygen pass.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Signed-off-by: Anne Jan Brouwer <brouwer@annejan.com>

* Say which strings are Git command names, for translators

The unfinished-operation message names the operation with Git's own
command (rebase, merge, cherry-pick, revert), which the user then runs with
--abort or --continue... (continued)

11 of 11 new or added lines in 2 files covered. (100.0%)

8361 of 8680 relevant lines covered (96.32%)

469.55 hits per line

Jobs
ID Job ID Ran Files Coverage
1 43607343846.1 14 Nov 2026 03:08PM UTC 87
96.32
GitHub Action Run
Source Files on build 43607343846
  • Tree
  • List 87
  • Changed 2
  • Source Changed 2
  • Coverage Changed 2
Coverage ∆ File Lines Relevant Covered Missed Hits/Line
  • Back to Repo
  • Github Actions Build #43607343846
  • 8d7af0f4 on github
  • Prev Build on main (#43598286462)
  • Next Build on main (#43608906972)
STATUS · Troubleshooting · Open an Issue · Sales · Support · CAREERS · ENTERPRISE · START FREE TRIAL · SCHEDULE DEMO
ANNOUNCEMENTS · TWITTER · TOS & SLA · Supported CI Services · What's a CI service? · Automated Testing

© 2026 Coveralls, Inc