Merge branch 'master' of https://github.com/wikimedia/git-fat

Support idiosyncratic workflows such as a custom server-side using
symlinks to an existing layout, where rsync pull needs --copy-links.

* 'master' of https://github.com/wikimedia/git-fat:
  Supporting multiple space separated rsync options
  Adding support for extra rsync options via rsync.options

1 files changed, 5 insertions, 2 deletions

diff --git a/git-fat b/git-fat
index e62f99b..092ec26 100755
--- a/git-fat
+++ b/git-fat
@@ -138,11 +138,12 @@ class GitFat(object):
         remote    = gitconfig_get('rsync.remote', file=cfgpath)
         ssh_port  = gitconfig_get('rsync.sshport', file=cfgpath)
         ssh_user  = gitconfig_get('rsync.sshuser', file=cfgpath)
+        options   = gitconfig_get('rsync.options', file=cfgpath)
         if remote is None:
             raise RuntimeError('No rsync.remote in %s' % cfgpath)
-        return remote, ssh_port, ssh_user
+        return remote, ssh_port, ssh_user, options
     def get_rsync_command(self,push):
-        (remote, ssh_port, ssh_user) = self.get_rsync()
+        (remote, ssh_port, ssh_user, options) = self.get_rsync()
         if push:
             self.verbose('Pushing to %s' % (remote))
         else:
@@ -156,6 +157,8 @@ class GitFat(object):
             rshopts += ' -p ' + ssh_port
         if rshopts:
             cmd.append('--rsh=ssh' + rshopts)
+        if options:
+            cmd += options.split(' ')
         if push:
             cmd += [self.objdir + '/', remote + '/']
         else: