diff options
author | Pete Wyckoff <pw@padd.com> | 2011-03-12 11:23:23 -0500 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-03-13 00:06:25 -0800 |
commit | ac34efcf214269201849a1ca32ab86614bfe4c8b (patch) | |
tree | 0dc64c20815833fd1b5d9c26cef63bbb8d961a3a /contrib | |
parent | git-p4: support clone --bare (diff) | |
download | tgif-ac34efcf214269201849a1ca32ab86614bfe4c8b.tar.xz |
git-p4: fix clone @all regression
e32e00d (git-p4: better message for "git-p4 sync" when not cloned,
2011-02-19) broke the use of the "@all" revision specifier, e.g.,
git-p4 clone //depot/xxx@all
Fix it as per Tor Arvid's quick patch.
Signed-off-by: Pete Wyckoff <pw@padd.com>
Reported-by: Anatol Pomozov <anatol.pomozov@gmail.com>
Based-on-patch-by: Tor Arvid Lund <torarvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib')
-rwxr-xr-x | contrib/fast-import/git-p4 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4 index 725af75995..3c44524cdf 100755 --- a/contrib/fast-import/git-p4 +++ b/contrib/fast-import/git-p4 @@ -1694,7 +1694,7 @@ class P4Sync(Command): changes.sort() else: - if not self.p4BranchesInGit: + if not isinstance(self, P4Clone) and not self.p4BranchesInGit: die("No remote p4 branches. Perhaps you never did \"git p4 clone\" in here."); if self.verbose: print "Getting p4 changes for %s...%s" % (', '.join(self.depotPaths), |