mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

sync: Improve integration with receive.denyCurrentBranch=updateInstead

Browse source 
By displaying error messages from the remote then it fails to update
its checked out branch.

Error messages in the default receive.denyCurrentBranch are still
suppressed, which matches user expectations.

This commit was sponsored by Nick Daly on Patreon.
This commit is contained in:
Joey Hess 2017-02-15 16:13:30 -04:00
parent 113b10cdc9
commit a73c8ce4a1
No known key found for this signature in database
GPG key ID: C910D9222512E3C7
3 changed files with 43 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

22
doc/todo/simpler_setup_for_post-update_merge.mdwn
View file

@ -25,18 +25,20 @@ filesystems, and on Windows.)
Alternatively, receive.denyCurrentBranch can be set to updateInstead.
With this configuration, `git annex sync` automatically updates the
work-tree of the remote already.
work-tree of the remote already.
However, any differences in the remote's work tree or index (other than new
unstaged files) prevent the work tree update. Currently, `git annex sync`
does the master:master push quietly, because in standard non-bare repos
that's expected to fail. So, failures to update the remote work tree
won't be noticed. (`git annex sync` could look at the remote's
receive.denyCurrentBranch setting, but this would be hard to do for ssh
remotes).
This wouldn't work for direct mode repositories, which are often used
on removable drives, since git thinks they're bare repos.
Also, this wouldn't work for direct mode repositories, which are often used
on removable drives.
Nor will it work for adjusted branches, since the adjusted branch is not
updated by the push.
---
Could the updateInstead configuration be made to work for direct mode and
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.
---