git-annex/Assistant
Joey Hess 3475b09c3e
pre-commit: Avoid committing the git-annex branch
Except when a commit is made in a view, which changes metadata.

Make the assistant commit the git-annex branch after git commit of working
tree changes.

This allows using the annex.commitmessage-command in the assistant to
generate a commit message for the git-annex branch that relies on state
gathered during the commit of the working tree. Eg, it might reuse the
commit message.

Note that, when not using the assistant, a git-annex add still commits
the git-annex branch, so such a annex.commitmessage-command set up would
not work then. But if someone is using the assistant and wants
programmatic control over commit messages, this is useful. Someone not
using the assistant can get the same result by using annex.alwayscommit=false
during the git-annex add, and git-annex merge after they git commit.

pre-commit was never really intended to commit the git-annex branch
(except after recording changed metadata), but the assistant did sort of
rely on it. It does later commit the git-annex branch before pushing to
remotes, but I didn't want to risk building up lots of uncommitted changes
to it if that didn't happen frequently.

Sponsored-by: the NIH-funded NICEMAN (ReproNim TR&D3) project
2024-02-12 14:42:11 -04:00
..
Alert Apply codespell -w throughout 2023-03-17 15:14:58 -04:00
Install fix build on OSX 2023-03-03 13:20:49 -04:00
Pairing filter out control characters in error messages 2023-04-10 13:50:51 -04:00
Threads pre-commit: Avoid committing the git-annex branch 2024-02-12 14:42:11 -04:00
Types Apply codespell -w throughout 2023-03-17 15:14:58 -04:00
WebApp assistant: When generating a gpg secret key, avoid hardcoding the key algorithm and size 2024-01-09 15:31:53 -04:00
Alert.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
BranchChange.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Changes.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Commits.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Common.hs use fastDebug everywhere it can be used 2021-04-06 15:41:24 -04:00
CredPairCache.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
DaemonStatus.hs let Remote.availability return Unavilable 2023-08-16 14:31:31 -04:00
DeleteRemote.hs filter out control characters in error messages 2023-04-10 13:50:51 -04:00
Drop.hs add SeekInput (not yet used) 2020-09-15 15:41:13 -04:00
Fsck.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Gpg.hs be stricter about rejecting invalid configurations for remotes 2020-01-10 14:52:48 -04:00
Install.hs Windows: Support long filenames in more (possibly all) of the code 2023-03-01 15:55:58 -04:00
MakeRemote.hs filter out control characters in error messages 2023-04-10 13:50:51 -04:00
MakeRepo.hs RawFilePath conversion 2023-10-26 13:58:49 -04:00
Monad.hs turn of PackageImports in cabal file 2022-02-25 13:16:36 -04:00
NamedThread.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Pairing.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Pushes.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
RemoteControl.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Repair.hs fix empty tree import when directory does not exist 2023-08-15 12:57:41 -04:00
RepoProblem.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Restart.hs split out Utility.Url.Parse 2023-08-14 12:28:10 -04:00
ScanRemotes.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Ssh.hs filter out control characters in error messages 2023-04-10 13:50:51 -04:00
Sync.hs convert checkAvailable to use availability rather than localpath 2023-08-16 15:57:30 -04:00
TransferQueue.hs fix --from overriding annex-ignore 2023-11-30 15:12:07 -04:00
TransferSlots.hs add directional stalldetection and bwlimit configs 2024-01-19 15:27:53 -04:00
Unused.hs Apply codespell -w throughout 2023-03-17 15:14:58 -04:00
Upgrade.hs filter out control characters in error messages 2023-04-10 13:50:51 -04:00
WebApp.hs unified AuthToken type between webapp and tor 2016-11-22 14:18:34 -04:00