summaryrefslogtreecommitdiff
blob: 042b948b23d7470fb6740d2add4129c71a749ce6 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
From b70919e0d9dadc93893e9d18bc3ef13b88756ecf Mon Sep 17 00:00:00 2001
From: dana <dana@dana.is>
Date: Sun, 27 Jan 2019 00:26:31 -0600
Subject: [PATCH] 44020: VCS_INFO_detect_p4: Fix infinite recursion

---
 ChangeLog                                      | 5 +++++
 Functions/VCS_Info/Backends/VCS_INFO_detect_p4 | 1 -
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 81668ccc9..be243c1b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-01-27  dana  <dana@dana.is>
+
+	* 44020: Functions/VCS_Info/Backends/VCS_INFO_detect_p4: Fix
+	infinite recursion
+
 2018-01-24  dana  <dana@dana.is>
 
 	* unposted: Config/version.mk: Post-release version bump
diff --git a/Functions/VCS_Info/Backends/VCS_INFO_detect_p4 b/Functions/VCS_Info/Backends/VCS_INFO_detect_p4
index d171c68ee..5ec21da9f 100644
--- a/Functions/VCS_Info/Backends/VCS_INFO_detect_p4
+++ b/Functions/VCS_Info/Backends/VCS_INFO_detect_p4
@@ -44,7 +44,6 @@ VCS_INFO_p4_get_server() {
 }
 
 
-(( ${+functions[VCS_INFO_detect_p4]} )) ||
 VCS_INFO_detect_p4() {
   local serverport p4where