Only add a CVS-branch header to the email if $X_BRANCH_HDR is defined.

This allows it to be switched off if necessary.

1 files changed, 6 insertions, 4 deletions

diff --git a/CVSROOT/log_accum.pl b/CVSROOT/log_accum.pl
index 63d67958ee61..918a43aae2dc 100755
--- a/CVSROOT/log_accum.pl
+++ b/CVSROOT/log_accum.pl
@@ -456,10 +456,12 @@ sub mail_notification {
 		print(MAIL $subject, "\n");
 	}
 
-	# Add a header to the mail msg showing which branches
-	# were modified during the commit.
-	%tags = map { $_ => 1 } &read_logfile("$TAGS_FILE.$PID");
-	print (MAIL "$X_BRANCH_HDR ", join(",", sort keys %tags), "\n");
+	# If required add a header to the mail msg showing
+	# which branches were modified during the commit.
+	if ($X_BRANCH_HDR) {
+		my %tags = map { $_ => 1 } &read_logfile("$TAGS_FILE.$PID");
+		print  MAIL "$X_BRANCH_HDR ", join(",", sort keys %tags), "\n";
+	}
 
 	print (MAIL "\n");