You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

35 lines
1.1 KiB

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