From 0d9b0eb7e2aa2d3a4f1e0081f0a79f10ca8c6c95 Mon Sep 17 00:00:00 2001 From: Jed Brown Date: Wed, 12 Mar 2014 12:01:32 -0600 Subject: pull: fix --all to avoid limiting by patterns in current tree Regression introduced in: commit c23422388b975f13867457c86c78361dfdf8036e Author: Tomas Herman Date: Tue Apr 23 11:59:38 2013 +0200 Added support for pulling only a subset of files. Reported-by: Nikola Kovacs --- git-fat | 2 ++ 1 file changed, 2 insertions(+) (limited to 'git-fat') diff --git a/git-fat b/git-fat index 9d61cae..7edb7ba 100755 --- a/git-fat +++ b/git-fat @@ -389,6 +389,8 @@ class GitFat(object): def filter_objects(self, refargs, patterns): files = self.referenced_objects(**refargs) - self.catalog_objects() + if refargs.get('all'): # Currently ignores patterns; can we efficiently do both? + return files orphans_matched = list(self.orphan_files(patterns)) orphans_objects = set(map(lambda x: x[0], orphans_matched)) return files & orphans_objects -- cgit v1.2.1