diff options
| author | Pete Wyckoff <pw@padd.com> | 2011-12-25 02:07:32 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-27 18:19:30 (GMT) |
| commit | ef86890ce5f01e6b5716ddcc11daddcd4e297157 (patch) | |
| tree | dcc37a98127e7afd658c7aadb4d45f2804969386 /contrib/fast-import | |
| parent | 6679c34c47be19ba8e9ea72129dfe768a49c5ab4 (diff) | |
| download | git-ef86890ce5f01e6b5716ddcc11daddcd4e297157.zip git-ef86890ce5f01e6b5716ddcc11daddcd4e297157.tar.gz git-ef86890ce5f01e6b5716ddcc11daddcd4e297157.tar.bz2 | |
git-p4: clone does not use --git-dir
Complain if --git-dir is given during a clone. It has no
effect. Only --destination and --bare can change where the newly
cloned git dir will be.
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 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4 index 5949803..dafc4a2 100755 --- a/contrib/fast-import/git-p4 +++ b/contrib/fast-import/git-p4 @@ -2335,7 +2335,8 @@ def main(): args = sys.argv[2:] if len(options) > 0: - options.append(optparse.make_option("--git-dir", dest="gitdir")) + if cmd.needsGit: + options.append(optparse.make_option("--git-dir", dest="gitdir")) parser = optparse.OptionParser(cmd.usage.replace("%prog", "%prog " + cmdName), options, |