From 2454a8b94ff90f33ff289b5d2026409f12e8da5c Mon Sep 17 00:00:00 2001
From: Toon Claes <toon@gitlab.com>
Date: Fri, 8 Jul 2022 15:33:05 +0200
Subject: golang: Remove v1.16 build tags

We recently switched to using Golang version 1.17 or higher, so we can
drop the old-style build tags.
---
 cmd/gitaly-git2go-v15/apply.go                   | 1 -
 cmd/gitaly-git2go-v15/cherry_pick.go             | 1 -
 cmd/gitaly-git2go-v15/cherry_pick_test.go        | 1 -
 cmd/gitaly-git2go-v15/commit.go                  | 1 -
 cmd/gitaly-git2go-v15/commit/change_file_mode.go | 1 -
 cmd/gitaly-git2go-v15/commit/commit.go           | 1 -
 cmd/gitaly-git2go-v15/commit/create_directory.go | 1 -
 cmd/gitaly-git2go-v15/commit/create_file.go      | 1 -
 cmd/gitaly-git2go-v15/commit/delete_file.go      | 1 -
 cmd/gitaly-git2go-v15/commit/move_file.go        | 1 -
 cmd/gitaly-git2go-v15/commit/update_file.go      | 1 -
 cmd/gitaly-git2go-v15/commit/validate.go         | 1 -
 cmd/gitaly-git2go-v15/conflicts.go               | 1 -
 cmd/gitaly-git2go-v15/conflicts_test.go          | 1 -
 cmd/gitaly-git2go-v15/featureflags.go            | 1 -
 cmd/gitaly-git2go-v15/main.go                    | 1 -
 cmd/gitaly-git2go-v15/merge.go                   | 1 -
 cmd/gitaly-git2go-v15/merge_test.go              | 1 -
 cmd/gitaly-git2go-v15/rebase.go                  | 1 -
 cmd/gitaly-git2go-v15/rebase_test.go             | 1 -
 cmd/gitaly-git2go-v15/resolve_conflicts.go       | 1 -
 cmd/gitaly-git2go-v15/revert.go                  | 1 -
 cmd/gitaly-git2go-v15/revert_test.go             | 1 -
 cmd/gitaly-git2go-v15/submodule.go               | 1 -
 cmd/gitaly-git2go-v15/submodule_test.go          | 1 -
 cmd/gitaly-git2go-v15/testhelper_test.go         | 1 -
 cmd/gitaly-git2go-v15/util.go                    | 1 -
 27 files changed, 27 deletions(-)

(limited to 'cmd')

diff --git a/cmd/gitaly-git2go-v15/apply.go b/cmd/gitaly-git2go-v15/apply.go
index 32ee50e72..2bd20b631 100644
--- a/cmd/gitaly-git2go-v15/apply.go
+++ b/cmd/gitaly-git2go-v15/apply.go
@@ -1,5 +1,4 @@
 //go:build static && system_libgit2
-// +build static,system_libgit2
 
 package main
 
diff --git a/cmd/gitaly-git2go-v15/cherry_pick.go b/cmd/gitaly-git2go-v15/cherry_pick.go
index 0b991a812..ada0c3b97 100644
--- a/cmd/gitaly-git2go-v15/cherry_pick.go
+++ b/cmd/gitaly-git2go-v15/cherry_pick.go
@@ -1,5 +1,4 @@
 //go:build static && system_libgit2
-// +build static,system_libgit2
 
 package main
 
diff --git a/cmd/gitaly-git2go-v15/cherry_pick_test.go b/cmd/gitaly-git2go-v15/cherry_pick_test.go
index cb4b3329f..be806c973 100644
--- a/cmd/gitaly-git2go-v15/cherry_pick_test.go
+++ b/cmd/gitaly-git2go-v15/cherry_pick_test.go
@@ -1,5 +1,4 @@
 //go:build static && system_libgit2
-// +build static,system_libgit2
 
 package main
 
diff --git a/cmd/gitaly-git2go-v15/commit.go b/cmd/gitaly-git2go-v15/commit.go
index 540135256..e6789e424 100644
--- a/cmd/gitaly-git2go-v15/commit.go
+++ b/cmd/gitaly-git2go-v15/commit.go
@@ -1,5 +1,4 @@
 //go:build static && system_libgit2
-// +build static,system_libgit2
 
 package main
 
diff --git a/cmd/gitaly-git2go-v15/commit/change_file_mode.go b/cmd/gitaly-git2go-v15/commit/change_file_mode.go
index 6e70b0c5a..e07db9ba4 100644
--- a/cmd/gitaly-git2go-v15/commit/change_file_mode.go
+++ b/cmd/gitaly-git2go-v15/commit/change_file_mode.go
@@ -1,5 +1,4 @@
 //go:build static && system_libgit2
-// +build static,system_libgit2
 
 package commit
 
diff --git a/cmd/gitaly-git2go-v15/commit/commit.go b/cmd/gitaly-git2go-v15/commit/commit.go
index 51f6020bc..43a07d012 100644
--- a/cmd/gitaly-git2go-v15/commit/commit.go
+++ b/cmd/gitaly-git2go-v15/commit/commit.go
@@ -1,5 +1,4 @@
 //go:build static && system_libgit2
-// +build static,system_libgit2
 
 package commit
 
diff --git a/cmd/gitaly-git2go-v15/commit/create_directory.go b/cmd/gitaly-git2go-v15/commit/create_directory.go
index fa1ecd742..061666ed3 100644
--- a/cmd/gitaly-git2go-v15/commit/create_directory.go
+++ b/cmd/gitaly-git2go-v15/commit/create_directory.go
@@ -1,5 +1,4 @@
 //go:build static && system_libgit2
-// +build static,system_libgit2
 
 package commit
 
diff --git a/cmd/gitaly-git2go-v15/commit/create_file.go b/cmd/gitaly-git2go-v15/commit/create_file.go
index fe88d45e5..926916561 100644
--- a/cmd/gitaly-git2go-v15/commit/create_file.go
+++ b/cmd/gitaly-git2go-v15/commit/create_file.go
@@ -1,5 +1,4 @@
 //go:build static && system_libgit2
-// +build static,system_libgit2
 
 package commit
 
diff --git a/cmd/gitaly-git2go-v15/commit/delete_file.go b/cmd/gitaly-git2go-v15/commit/delete_file.go
index 62601235d..a5af77b7b 100644
--- a/cmd/gitaly-git2go-v15/commit/delete_file.go
+++ b/cmd/gitaly-git2go-v15/commit/delete_file.go
@@ -1,5 +1,4 @@
 //go:build static && system_libgit2
-// +build static,system_libgit2
 
 package commit
 
diff --git a/cmd/gitaly-git2go-v15/commit/move_file.go b/cmd/gitaly-git2go-v15/commit/move_file.go
index 9a6a290d6..b31853c96 100644
--- a/cmd/gitaly-git2go-v15/commit/move_file.go
+++ b/cmd/gitaly-git2go-v15/commit/move_file.go
@@ -1,5 +1,4 @@
 //go:build static && system_libgit2
-// +build static,system_libgit2
 
 package commit
 
diff --git a/cmd/gitaly-git2go-v15/commit/update_file.go b/cmd/gitaly-git2go-v15/commit/update_file.go
index 6c2ef74a3..cea5d629b 100644
--- a/cmd/gitaly-git2go-v15/commit/update_file.go
+++ b/cmd/gitaly-git2go-v15/commit/update_file.go
@@ -1,5 +1,4 @@
 //go:build static && system_libgit2
-// +build static,system_libgit2
 
 package commit
 
diff --git a/cmd/gitaly-git2go-v15/commit/validate.go b/cmd/gitaly-git2go-v15/commit/validate.go
index 706ae45ce..ab3f972b1 100644
--- a/cmd/gitaly-git2go-v15/commit/validate.go
+++ b/cmd/gitaly-git2go-v15/commit/validate.go
@@ -1,5 +1,4 @@
 //go:build static && system_libgit2
-// +build static,system_libgit2
 
 package commit
 
diff --git a/cmd/gitaly-git2go-v15/conflicts.go b/cmd/gitaly-git2go-v15/conflicts.go
index a569533c1..c29f729df 100644
--- a/cmd/gitaly-git2go-v15/conflicts.go
+++ b/cmd/gitaly-git2go-v15/conflicts.go
@@ -1,5 +1,4 @@
 //go:build static && system_libgit2
-// +build static,system_libgit2
 
 package main
 
diff --git a/cmd/gitaly-git2go-v15/conflicts_test.go b/cmd/gitaly-git2go-v15/conflicts_test.go
index 4551ceb7c..5e24b91bb 100644
--- a/cmd/gitaly-git2go-v15/conflicts_test.go
+++ b/cmd/gitaly-git2go-v15/conflicts_test.go
@@ -1,5 +1,4 @@
 //go:build static && system_libgit2
-// +build static,system_libgit2
 
 package main
 
diff --git a/cmd/gitaly-git2go-v15/featureflags.go b/cmd/gitaly-git2go-v15/featureflags.go
index 669fe0445..720320901 100644
--- a/cmd/gitaly-git2go-v15/featureflags.go
+++ b/cmd/gitaly-git2go-v15/featureflags.go
@@ -1,5 +1,4 @@
 //go:build static && system_libgit2 && gitaly_test
-// +build static,system_libgit2,gitaly_test
 
 package main
 
diff --git a/cmd/gitaly-git2go-v15/main.go b/cmd/gitaly-git2go-v15/main.go
index 2ce2796ae..e8a2c2c7b 100644
--- a/cmd/gitaly-git2go-v15/main.go
+++ b/cmd/gitaly-git2go-v15/main.go
@@ -1,5 +1,4 @@
 //go:build static && system_libgit2
-// +build static,system_libgit2
 
 package main
 
diff --git a/cmd/gitaly-git2go-v15/merge.go b/cmd/gitaly-git2go-v15/merge.go
index 313a22f4e..3a1d8bfb8 100644
--- a/cmd/gitaly-git2go-v15/merge.go
+++ b/cmd/gitaly-git2go-v15/merge.go
@@ -1,5 +1,4 @@
 //go:build static && system_libgit2
-// +build static,system_libgit2
 
 package main
 
diff --git a/cmd/gitaly-git2go-v15/merge_test.go b/cmd/gitaly-git2go-v15/merge_test.go
index 8f1b79968..c86056c6b 100644
--- a/cmd/gitaly-git2go-v15/merge_test.go
+++ b/cmd/gitaly-git2go-v15/merge_test.go
@@ -1,5 +1,4 @@
 //go:build static && system_libgit2
-// +build static,system_libgit2
 
 package main
 
diff --git a/cmd/gitaly-git2go-v15/rebase.go b/cmd/gitaly-git2go-v15/rebase.go
index a385094e9..e2cc3022f 100644
--- a/cmd/gitaly-git2go-v15/rebase.go
+++ b/cmd/gitaly-git2go-v15/rebase.go
@@ -1,5 +1,4 @@
 //go:build static && system_libgit2
-// +build static,system_libgit2
 
 package main
 
diff --git a/cmd/gitaly-git2go-v15/rebase_test.go b/cmd/gitaly-git2go-v15/rebase_test.go
index a7df2a912..5e86bda1a 100644
--- a/cmd/gitaly-git2go-v15/rebase_test.go
+++ b/cmd/gitaly-git2go-v15/rebase_test.go
@@ -1,5 +1,4 @@
 //go:build static && system_libgit2
-// +build static,system_libgit2
 
 package main
 
diff --git a/cmd/gitaly-git2go-v15/resolve_conflicts.go b/cmd/gitaly-git2go-v15/resolve_conflicts.go
index ff73ee749..aa6159262 100644
--- a/cmd/gitaly-git2go-v15/resolve_conflicts.go
+++ b/cmd/gitaly-git2go-v15/resolve_conflicts.go
@@ -1,5 +1,4 @@
 //go:build static && system_libgit2
-// +build static,system_libgit2
 
 package main
 
diff --git a/cmd/gitaly-git2go-v15/revert.go b/cmd/gitaly-git2go-v15/revert.go
index 8c84f909f..9c66c4865 100644
--- a/cmd/gitaly-git2go-v15/revert.go
+++ b/cmd/gitaly-git2go-v15/revert.go
@@ -1,5 +1,4 @@
 //go:build static && system_libgit2
-// +build static,system_libgit2
 
 package main
 
diff --git a/cmd/gitaly-git2go-v15/revert_test.go b/cmd/gitaly-git2go-v15/revert_test.go
index 5cea73d44..8d0294ff7 100644
--- a/cmd/gitaly-git2go-v15/revert_test.go
+++ b/cmd/gitaly-git2go-v15/revert_test.go
@@ -1,5 +1,4 @@
 //go:build static && system_libgit2
-// +build static,system_libgit2
 
 package main
 
diff --git a/cmd/gitaly-git2go-v15/submodule.go b/cmd/gitaly-git2go-v15/submodule.go
index 08c893cef..3c2f2e0eb 100644
--- a/cmd/gitaly-git2go-v15/submodule.go
+++ b/cmd/gitaly-git2go-v15/submodule.go
@@ -1,5 +1,4 @@
 //go:build static && system_libgit2
-// +build static,system_libgit2
 
 package main
 
diff --git a/cmd/gitaly-git2go-v15/submodule_test.go b/cmd/gitaly-git2go-v15/submodule_test.go
index 3669a1559..11d6ee065 100644
--- a/cmd/gitaly-git2go-v15/submodule_test.go
+++ b/cmd/gitaly-git2go-v15/submodule_test.go
@@ -1,5 +1,4 @@
 //go:build static && system_libgit2
-// +build static,system_libgit2
 
 package main
 
diff --git a/cmd/gitaly-git2go-v15/testhelper_test.go b/cmd/gitaly-git2go-v15/testhelper_test.go
index 21fc90b13..a3ceafa8a 100644
--- a/cmd/gitaly-git2go-v15/testhelper_test.go
+++ b/cmd/gitaly-git2go-v15/testhelper_test.go
@@ -1,5 +1,4 @@
 //go:build static && system_libgit2
-// +build static,system_libgit2
 
 package main
 
diff --git a/cmd/gitaly-git2go-v15/util.go b/cmd/gitaly-git2go-v15/util.go
index feed724ab..7a94371c3 100644
--- a/cmd/gitaly-git2go-v15/util.go
+++ b/cmd/gitaly-git2go-v15/util.go
@@ -1,5 +1,4 @@
 //go:build static && system_libgit2
-// +build static,system_libgit2
 
 package main
 
-- 
cgit v1.2.3