From 01c66130e6f007a4eb49abf0c59d0da1145810a9 Mon Sep 17 00:00:00 2001 From: Jed Brown Date: Mon, 24 Dec 2012 13:59:21 -0600 Subject: Rsync needs trailing slash when pushing one file to a directory that does not yet exist --- git-fat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'git-fat') diff --git a/git-fat b/git-fat index 2133068..14983f4 100755 --- a/git-fat +++ b/git-fat @@ -239,7 +239,7 @@ class GitFat(object): files = self.referenced_objects(all=pushall) & self.catalog_objects() remote = self.get_rsync() self.verbose('Pushing to %s' % (remote)) - cmd = ['rsync', '--progress', '--ignore-existing', '--from0', '--files-from=-', self.objdir + '/', remote] + cmd = ['rsync', '--progress', '--ignore-existing', '--from0', '--files-from=-', self.objdir + '/', remote + '/'] p = subprocess.Popen(cmd, stdin=subprocess.PIPE) p.communicate(input='\x00'.join(files)) def checkout(self, show_orphans=False): @@ -273,7 +273,7 @@ class GitFat(object): refargs['rev'] = rev files = self.referenced_objects(**refargs) - self.catalog_objects() remote = self.get_rsync() - cmd = ['rsync', '--progress', '--ignore-existing', '--from0', '--files-from=-', remote + '/', self.objdir] + cmd = ['rsync', '--progress', '--ignore-existing', '--from0', '--files-from=-', remote + '/', self.objdir + '/'] p = subprocess.Popen(cmd, stdin=subprocess.PIPE) p.communicate(input='\x00'.join(files)) self.checkout() -- cgit v1.2.1