diff options
author | Jed Brown <jed@59A2.org> | 2014-03-12 15:26:42 -0600 |
---|---|---|
committer | Jed Brown <jed@59A2.org> | 2014-03-12 15:26:42 -0600 |
commit | 22b3c22f801a4636d899c277bafd9edfd22275f3 (patch) | |
tree | f33e5e43a10496eb25547f6eb526e05b2a195b7d | |
parent | 8afedf3be29eeb1e38fd08dd9226b8741aaff4fe (diff) | |
parent | 0d9b0eb7e2aa2d3a4f1e0081f0a79f10ca8c6c95 (diff) | |
download | git-fat-22b3c22f801a4636d899c277bafd9edfd22275f3.tar.gz |
Merge branch 'jed/pull-all'
Fixes #23
* jed/pull-all:
pull: fix --all to avoid limiting by patterns in current tree
filter_objects: remove printing that doesn't belong in internal functions
filter_objects: files is already a set
-rwxr-xr-x | git-fat | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -389,12 +389,11 @@ class GitFat(object): def filter_objects(self, refargs, patterns): files = self.referenced_objects(**refargs) - self.catalog_objects() - files_set = set(files) + if refargs.get('all'): # Currently ignores patterns; can we efficiently do both? + return files orphans_matched = list(self.orphan_files(patterns)) - print("pulling:") - print(map(lambda x: x[1], orphans_matched)) orphans_objects = set(map(lambda x: x[0], orphans_matched)) - return files_set & orphans_objects + return files & orphans_objects def cmd_checkout(self, args): self.checkout(show_orphans=True) |