Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
710593c
feat(hooks): run post-checkout, post-merge and post-rewrite hooks
ChrisLauinger77 Nov 6, 2026
9cf6fb4
docs: note the post-checkout, post-merge and post-rewrite hooks
ChrisLauinger77 Nov 6, 2026
d6af2c4
fix(hooks): run rebase and merge post-hooks the way git does
ChrisLauinger77 Nov 6, 2026
2153300
docs: note when the rebase post-hooks run and the ORIG_HEAD write
ChrisLauinger77 Nov 6, 2026
673580b
fix(hooks): keep a skipped hook skipped and offer the skip before hoo…
ChrisLauinger77 Nov 6, 2026
68378aa
docs: note the rebase skip marker, versioned hook folders and the reb…
ChrisLauinger77 Nov 6, 2026
a72eb0f
fix(hooks): offer the pull skip for linked hooks and keep warnings on…
ChrisLauinger77 Nov 6, 2026
4ee167a
docs: note hook symlinks into the worktree and warnings on a failed r…
ChrisLauinger77 Nov 6, 2026
6a7072c
fix(hooks): offer the pull skip whenever a hook path passes through t…
ChrisLauinger77 Nov 6, 2026
04c85cc
docs: note how hook paths through the worktree are detected
ChrisLauinger77 Nov 6, 2026
c298a0f
fix(hooks): resolve hook paths like the filesystem and recheck them o…
ChrisLauinger77 Nov 6, 2026
d264cc6
docs: note the filesystem-style hook path walk and the Pull menu recheck
ChrisLauinger77 Nov 6, 2026
11bc260
fix(hooks): count tracked config includes, ignore untracked submodule…
ChrisLauinger77 Nov 6, 2026
4030ee5
docs: note config includes, the submodule precondition and the locked…
ChrisLauinger77 Nov 6, 2026
9c44399
fix(hooks): keep the skip when the config scan is cut short, honour s…
ChrisLauinger77 Nov 6, 2026
914b8d7
docs: note the conservative config scan limit and the submodule rules…
ChrisLauinger77 Nov 6, 2026
b5b42a6
fix(hooks): one post-checkout per bulk discard, checked skip pulls, c…
ChrisLauinger77 Nov 6, 2026
b656cc6
docs: note bulk discards, the checked skip pull, contained group hook…
ChrisLauinger77 Nov 6, 2026
2663b8f
fix(hooks): report each file of a bulk discard instead of claiming su…
ChrisLauinger77 Nov 6, 2026
0bc683b
docs: note per-file bulk discard results and the toHaveCount(0) e2e trap
ChrisLauinger77 Nov 6, 2026
29734d1
fix(hooks): wait for Windows hook leftovers and finish partial staged…
ChrisLauinger77 Nov 6, 2026
a74215a
docs: note the Windows job object and per-file results for staged dis…
ChrisLauinger77 Nov 6, 2026
ac74c45
fix(hooks): contain Windows group hooks and preserve staged renames
ChrisLauinger77 Nov 6, 2026
0a6890e
fix: retry staged rename discards and bound hook cleanup
ChrisLauinger77 Nov 6, 2026
9827a34
fix(hooks): bound Unix group hook cleanup
ChrisLauinger77 Nov 6, 2026
d07cc39
fix(hooks): show post-hook progress and defer group cleanup
ChrisLauinger77 Nov 7, 2026
85929a1
fix: protect staged changes and preserve Git include paths
ChrisLauinger77 Nov 7, 2026
f70cee0
fix: roll back symlink discards and resolve home includes
ChrisLauinger77 Nov 7, 2026
b399772
fix: roll back unpaired symlink discards and find Git home
ChrisLauinger77 Nov 7, 2026
8c7aab8
fix: preserve symlink state during staged discard
ChrisLauinger77 Nov 7, 2026
1fbb38b
test: match libgit2 index lock diagnostic on Windows
ChrisLauinger77 Nov 7, 2026
4400449
fix: contain staged discard cleanup within the worktree
ChrisLauinger77 Nov 7, 2026
4073399
fix: guard discard backups and report hook timeout details
ChrisLauinger77 Nov 7, 2026
993fcbc
fix: preserve staged links and report unverified hook exits
ChrisLauinger77 Nov 7, 2026
63e6e8e
fix: roll back failed rename discards and report hook uncertainty
ChrisLauinger77 Nov 7, 2026
5e6be5b
fix: restore rename destinations beside their Windows backups
ChrisLauinger77 Nov 7, 2026
9332d11
fix: rename Windows discard backups through open handles
ChrisLauinger77 Nov 7, 2026
e6c8151
fix: warn on unconfirmed hook exit after cancelling pull all
ChrisLauinger77 Nov 7, 2026
b6613c1
fix: signal only verified hook process groups on cancel
ChrisLauinger77 Nov 7, 2026
70b8d0c
docs: qualify pull all hook cleanup on cancel
ChrisLauinger77 Nov 7, 2026
24a454c
fix: enforce hook deadlines while cancelling pull all
ChrisLauinger77 Nov 7, 2026
a3df747
fix: register background hooks before draining output
ChrisLauinger77 Nov 7, 2026
65d6f97
refactor(discard): move staged discard rollback to its own pull request
ChrisLauinger77 Nov 9, 2026
cb156c7
fix(hooks): treat an empty hook process group as finished on cancel
ChrisLauinger77 Nov 9, 2026
00c4ce6
fix(hooks): show an info toast while a hook still runs
ChrisLauinger77 Nov 9, 2026
da17db1
fix(hooks): release exited child handles before checking job accounting
ChrisLauinger77 Nov 9, 2026
61d8d3f
fix(hooks): honor rebase aborts during post-checkout
ChrisLauinger77 Nov 11, 2026
f56ecc9
fix(hooks): lock worktree targets through post-checkout
ChrisLauinger77 Nov 11, 2026
d2c6bf8
test(hooks): branch on available process-group signals
ChrisLauinger77 Nov 11, 2026
b7b6d1e
ci: retry macOS runner allocation
ChrisLauinger77 Nov 11, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 56 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,62 @@ All notable changes to AngKorGit are documented here. The format follows

## [Unreleased]

### Added
- **Checkouts, merges and rewrites run your `post-*` hooks.** `post-checkout`,
`post-merge` and `post-rewrite` now run after the operations that run them in `git`,
with the same arguments and input:
- `post-checkout` after a checkout, a new branch you check out, a detached checkout,
a pull request checkout, a clone, a new worktree, and after discarding or applying
files from a stash (`git restore` runs it too, with flag `0`).
- `post-merge` after a merge or a pull that merged or fast-forwarded.
- `post-rewrite` after amend, reword, rebase, interactive rebase and a pull with
rebase, once with every rewritten commit, also when a paused rebase is continued.
As in `git`, a failing hook never undoes the operation: AngKorGit shows a warning
with **Show output** instead of an error. AngKorGit attempts to stop a foreground
hook at its 10-minute limit and reports a timeout with any captured output. The
warning says when exit could not be confirmed. **Skip hooks** in the commit box
also skips `post-rewrite` when amending, and the Pull menu has **Pull without hooks** when the
repository has one of these hooks, or keeps its hooks in a folder inside the repository
(like `.husky`), links a hook to a file there, or includes a Git config file from the
repository, where a pull can bring a new one. A rebase you started without hooks
stays without hooks when you continue it after a conflict. (#82)
- **Pull all runs `post-merge` in each repository it fast-forwarded.** One at a time,
never for a repository that was already up to date; a failing hook shows as a warning
with its output on that repository's row and the rest of the group still updates.
**Pull all without hooks** in the group menu skips it. **Cancel** waits for the
checkout and foreground hook already in progress. During that wait, it monitors
tracked background hooks and requests termination at each hook's original deadline.
On macOS and on Linux without usable process-group pidfd support, Cancel can finish
while background hook processes are still running. The affected repository's row
warns that exit could not be confirmed. Those processes may keep writing to the
repository past the hook's original deadline. (#69, #82)

### Changed
- **Rebasing a branch that already sits on top of its target does nothing**, like
`git rebase`: it reports "Already up to date" instead of re-creating the branch's
commits with new commit dates. Uncommitted changes or an unfinished operation still
stop it first.
- **Fast-forward merges and pulls set `ORIG_HEAD`** to the commit you were on, like
`git merge` does, so `git diff ORIG_HEAD HEAD` shows what a pull brought in.

### Fixed
- **New worktrees stay protected while their post-checkout hook runs.** The target
folder is reserved before creation, including access through a symlink alias,
so another operation gets an info toast until the hook finishes.
- **Aborting a rebase while post-checkout runs no longer reports a missing rebase
state file.** Once the hook returns, the rebase reports that it was aborted and
leaves the restored branch untouched, without replaying commits or post-rewrite.
- **A running hook gets an info toast when you try another operation.** It names
the hook and repository, such as "post-checkout is still running in angkorgit",
while the progress toast stays visible.
- **Cancel no longer warns about hooks that already finished.** Pull all treats an
empty hook process group as finished on macOS and Linux, including an `exit 0` hook.
A live group without a safe signalling handle still warns immediately. Children
that leave the group with `setsid` or daemonize are not tracked, as with Git.
- **Discarding several files, or all staged changes, no longer stops at a file it
cannot discard.** The other files are still restored, and AngKorGit names the files
it could not discard instead of reporting every change as discarded.

## [0.27.0] — 2026-11-09

The review release. Text is easier to read in every theme, diffs are calmer to review,
Expand Down
348 changes: 330 additions & 18 deletions CLAUDE.md

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions apps/desktop/src-tauri/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions apps/desktop/src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ keyring = { version = "3", features = ["apple-native", "windows-native", "sync-s
notify-debouncer-mini = "0.4"
reqwest = { version = "0.12", default-features = false, features = ["rustls-tls", "json"] }
which = "7"
same-file = "1"
fontdb = { version = "0.24", default-features = false, features = ["std", "fs", "memmap", "fontconfig"] }

[target.'cfg(unix)'.dependencies]
Expand All @@ -48,6 +49,10 @@ gtk = "0.18"
# through OpenSSL on Windows instead; this compiles OpenSSL from source and
# needs Perl available at build time.
libssh2-sys = { version = "0.3", features = ["openssl-on-win32", "vendored-openssl"] }
windows-sys = { version = "0.61", features = ["Win32_Foundation", "Win32_Security", "Win32_System_Diagnostics_ToolHelp", "Win32_System_JobObjects", "Win32_System_Threading"] }

[dev-dependencies]
tempfile = "3"

[profile.release]
codegen-units = 1
Expand Down
Loading
Loading