diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2017-02-17 12:57:55 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-02-17 12:57:55 -0400 |
| commit | ee07d1d35324c40bd15c855676f3f6300dc87a76 (patch) | |
| tree | 9d632aa243c33054ed93024bb8627034686039e4 /doc | |
| parent | abafc224c0da136535a5210c13058a65643ada09 (diff) | |
thoughts
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/todo/simpler_setup_for_remote_worktree_update_on_push.mdwn | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/doc/todo/simpler_setup_for_remote_worktree_update_on_push.mdwn b/doc/todo/simpler_setup_for_remote_worktree_update_on_push.mdwn index 8d25f44b9..4f1ffba65 100644 --- a/doc/todo/simpler_setup_for_remote_worktree_update_on_push.mdwn +++ b/doc/todo/simpler_setup_for_remote_worktree_update_on_push.mdwn @@ -40,6 +40,19 @@ adjusted branches? Could install a post-update hook, that runs a git-annex command that checks for updateInstead, and emulates its behavior, handling direct mode and adjusted branches. +To support direct mode repos on removable drives w/o execute bits, +could make sync check local remotes and run the equivilant action as the +hook would run. + +To fully emulate updateInstead, the post-update hook +should abort if the tree is unclean or if there are merge conflicts. +But, in a direct mode repo, the only way the user will likely resolve such +a situation is git-annex sync/merge, so the hook could just run git-annex +merge instead of trying to fully emulate regular updateInstead behavior. +Similarly, in an adjusted branch, the push will update master, and git +annex sync/merge is what the user will likely do. Although they could +choose to reset changes to the tree. + --- Potential least surprise violation: |