Use 'HEAD' instead of 'CURRENT', while retaining backward compatibility.

4 files changed, 11 insertions, 11 deletions

diff --git a/tools/tools/tinderbox/tbmaster.1 b/tools/tools/tinderbox/tbmaster.1
index 3c218af3ee00..b9b256fcbced 100644
--- a/tools/tools/tinderbox/tbmaster.1
+++ b/tools/tools/tinderbox/tbmaster.1
@@ -27,7 +27,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd August 18, 2004
+.Dd July 20, 2005
 .Dt TBMASTER 1
 .Os
 .Sh NAME
@@ -108,7 +108,7 @@ Read-only.
 .Pq Vt multiple
 A list of source branches to build.
 The default value is
-.Dq CURRENT .
+.Dq HEAD .
 .It CFLAGS
 .Pq Vt single
 The desired value for the
diff --git a/tools/tools/tinderbox/tbmaster.pl b/tools/tools/tinderbox/tbmaster.pl
index 3917b3b9308f..8ea5b2752b9f 100644
--- a/tools/tools/tinderbox/tbmaster.pl
+++ b/tools/tools/tinderbox/tbmaster.pl
@@ -46,7 +46,7 @@ my $lockfile;			# Lock file name
 my $lock;			# Lock file descriptor
 
 my %INITIAL_CONFIG = (
-    'BRANCHES'	=> [ 'CURRENT' ],
+    'BRANCHES'	=> [ 'HEAD' ],
     'CFLAGS'	=> '',
     'COPTFLAGS'	=> '',
     'COMMENT'	=> '',
diff --git a/tools/tools/tinderbox/tinderbox.1 b/tools/tools/tinderbox/tinderbox.1
index ea1f193e7f03..37121035f758 100644
--- a/tools/tools/tinderbox/tinderbox.1
+++ b/tools/tools/tinderbox/tinderbox.1
@@ -27,7 +27,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd June 21, 2004
+.Dd July 20, 2005
 .Dt TINDERBOX 1
 .Os
 .Sh NAME
@@ -64,7 +64,7 @@ The default is to use
 .Fl A
 instead, to get the head.
 Specifying
-.Va CURRENT
+.Va HEAD
 as the argument to
 .Fl -branch
 is equivalent to leaving it unspecified.
diff --git a/tools/tools/tinderbox/tinderbox.pl b/tools/tools/tinderbox/tinderbox.pl
index 4d84ed4c40ee..944b8b19cdb1 100644
--- a/tools/tools/tinderbox/tinderbox.pl
+++ b/tools/tools/tinderbox/tinderbox.pl
@@ -40,7 +40,7 @@ my $COPYRIGHT	= "Copyright (c) 2003 Dag-Erling Smørgrav. " .
 		  "All rights reserved.";
 
 my $arch;			# Target architecture
-my $branch;			# CVS branch to checkou
+my $branch;			# CVS branch to check out
 my $cvsup;			# Name of CVSup server
 my $date;			# Date of sources to check out
 my $jobs;			# Number of paralell jobs
@@ -304,7 +304,7 @@ MAIN:{
     chomp($hostname);
     $machine = `/usr/bin/uname -m`;
     chomp($machine);
-    $branch = "CURRENT";
+    $branch = "HEAD";
     $jobs = 0;
     $repository = "/home/ncvs";
     $sandbox = "/tmp/tinderbox";
@@ -337,7 +337,7 @@ MAIN:{
     if ($branch !~ m|^(\w+)$|) {
 	error("invalid source branch");
     }
-    $branch = $1;
+    $branch = ($1 eq 'CURRENT') ? 'HEAD' : $1;
     if ($arch !~ m|^(\w+)$|) {
 	error("invalid target architecture");
     }
@@ -451,7 +451,7 @@ MAIN:{
 	    print(SUPFILE "*default prefix=$sandbox\n");
 	    print(SUPFILE "*default delete use-rel-suffix\n");
 	    print(SUPFILE "src-all release=cvs");
-	    if ($branch eq 'CURRENT') {
+	    if ($branch eq 'HEAD') {
 		print(SUPFILE " tag=.");
 	    } else {
 		print(SUPFILE " tag=$branch");
@@ -482,7 +482,7 @@ MAIN:{
 	    } else {
 		push(@cvsargs, "checkout", "-P");
 	    };
-	    push(@cvsargs, ($branch eq 'CURRENT') ? "-A" : "-r$branch")
+	    push(@cvsargs, ($branch eq 'HEAD') ? "-A" : "-r$branch")
 		if defined($branch);
 	    push(@cvsargs, "-D$date")
 		if defined($date);
@@ -536,7 +536,7 @@ MAIN:{
 	$ENV{'CHROOTDIR'} = "$sandbox/root";
 	$ENV{'CVSROOT'} = $repository;
 	$ENV{'RELEASETAG'} = $branch
-	    if $branch ne 'CURRENT';
+	    if $branch ne 'HEAD';
 	$ENV{'CVSCMDARGS'} = "-D$date"
 	    if defined($date);
 	$ENV{'WORLD_FLAGS'} = $ENV{'KERNEL_FLAGS'} =