diff options
| author |  Pete Wyckoff <pw@padd.com> | 2011-12-24 21:07:39 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-12-27 10:19:31 -0800 |
| commit | 09fca77b9ecd64e2008835208bab29e15a4b2809 (patch) | |
| tree | b4a7e2c95118b4d39b562ba18592d43c2bb6a5ce /contrib/fast-import | |
| parent | git-p4: test --keep-path (diff) | |
| download | tgif-09fca77b9ecd64e2008835208bab29e15a4b2809.tar.xz | |
git-p4: test and document --use-client-spec
The depot path is required, even with this option. Make sure
git-p4 fails and exits with non-zero.
Contents in the specified depot path will be rearranged according
to the client spec. Test this and add a note in the docs.
Leave an XXX suggesting that this is somewhat confusing behavior
that might be good to fix later.
Function stripRepoPath() looks at self.useClientSpec. Make sure
this is set both for command-line option --use-client-spec and
for configuration variable git-p4.useClientSpec. Test this.
Signed-off-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/fast-import')
| -rwxr-xr-x | contrib/fast-import/git-p4 | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4 index d0a9b0d877..5420bf1368 100755 --- a/contrib/fast-import/git-p4 +++ b/contrib/fast-import/git-p4 @@ -1951,7 +1951,10 @@ class P4Sync(Command, P4UserMap): if not gitBranchExists(self.refPrefix + "HEAD") and self.importIntoRemotes and gitBranchExists(self.branch): system("git symbolic-ref %sHEAD %s" % (self.refPrefix, self.branch)) - if self.useClientSpec or gitConfig("git-p4.useclientspec") == "true": + if not self.useClientSpec: + if gitConfig("git-p4.useclientspec", "--bool") == "true": + self.useClientSpec = True + if self.useClientSpec: self.getClientSpec() # TODO: should always look at previous commits, @@ -2380,6 +2383,7 @@ def main(): if not cmd.run(args): parser.print_help() + sys.exit(2) if __name__ == '__main__': |