diff options
| author | Igor Kushnir <igorkuo@gmail.com> | 2016-12-29 12:22:23 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-12-29 13:54:05 -0800 |
| commit | bc233524c96518c04650d297ad81a9c948fc2e41 (patch) | |
| tree | cfe5250988723b077956526129b9157b6afeb05a /Documentation | |
| parent | 89a6ecc55b55ae87c39c5d9edb115731550fba95 (diff) | |
| download | git-bc233524c96518c04650d297ad81a9c948fc2e41.tar.gz git-bc233524c96518c04650d297ad81a9c948fc2e41.tar.xz | |
git-p4: do not pass '-r 0' to p4 commands
git-p4 crashes when used with a very old p4 client version
that does not support the '-r <number>' option in its commands.
Allow making git-p4 work with old p4 clients by setting git-p4.retries to 0.
Alternatively git-p4.retries could be made opt-in.
But since only very old, barely maintained p4 versions don't support
the '-r' option, the setting-retries-to-0 workaround would do.
The "-r retries" option is present in Perforce 2012.2 Command Reference,
but absent from Perforce 2012.1 Command Reference.
Signed-off-by: Igor Kushnir <igorkuo@gmail.com>
Acked-by: Lars Schneider <larsxschneider@gmail.com>
Reviewed-by: Luke Diamand <luke@diamand.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-p4.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt index 656587248..5352cae4b 100644 --- a/Documentation/git-p4.txt +++ b/Documentation/git-p4.txt @@ -470,6 +470,8 @@ git-p4.client:: git-p4.retries:: Specifies the number of times to retry a p4 command (notably, 'p4 sync') if the network times out. The default value is 3. + Set the value to 0 to disable retries or if your p4 version + does not support retries (pre 2012.2). Clone and sync variables ~~~~~~~~~~~~~~~~~~~~~~~~ |