summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Functions/VCS_Info/Backends/VCS_INFO_detect_p41
2 files changed, 5 insertions, 1 deletions
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