diff options
author | Joey Hess <joey@kitenet.net> | 2011-06-21 14:29:09 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2011-06-21 14:33:59 -0400 |
commit | c03af0ed0c6530742206740e8b3fc75f5f959325 (patch) | |
tree | 344320bec4d9e83e901e00f3ed99aea368f16a0d /Version.hs | |
parent | e735d459b531246798622994718eaccfcf0086ab (diff) |
code to update a git-annex branch
There is no suitable git hook to run code when pulling changes that
might need to be merged into the git-annex branch. The post-merge hook
is only run when changes are merged into HEAD, and it's possible,
and indeed likely that many pulls will only have changes in git-annex,
but not in HEAD, and not trigger it.
So, git-annex will have to take care to update the branch before reading
from it, to make sure it has merged in current info from remotes. Happily,
this can be done quite inexpensively, just a git-show-ref to list
branches, and a minimalized git-log to see if there are unmerged changes
on the branches. To further speed up, it will be done only once per
git-annex run, max.
Diffstat (limited to 'Version.hs')
0 files changed, 0 insertions, 0 deletions