From df2ff5ec708dfee88e2b8cc34a54c8215ccb2251 Mon Sep 17 00:00:00 2001
From: Tim Byrne <sultan@locehilios.com>
Date: Sat, 26 Dec 2020 12:29:49 -0600
Subject: [PATCH] Remove deprecated option cygwin-copy

---
 test/test_alt_copy.py | 11 ++---------
 yadm                  |  3 ---
 yadm.1                |  6 ------
 3 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/test/test_alt_copy.py b/test/test_alt_copy.py
index bd54fed..fa8e09c 100644
--- a/test/test_alt_copy.py
+++ b/test/test_alt_copy.py
@@ -4,10 +4,6 @@ import os
 import pytest
 
 
-@pytest.mark.parametrize(
-    'cygwin',
-    [pytest.param(True, marks=pytest.mark.deprecated), False],
-    ids=['cygwin', 'no-cygwin'])
 @pytest.mark.parametrize(
     'setting, expect_link, pre_existing', [
         (None, True, None),
@@ -26,14 +22,11 @@ import pytest
 @pytest.mark.usefixtures('ds1_copy')
 def test_alt_copy(
         runner, yadm_cmd, paths, tst_sys,
-        setting, expect_link, pre_existing,
-        cygwin):
+        setting, expect_link, pre_existing):
     """Test yadm.alt-copy"""
 
-    option = 'yadm.cygwin-copy' if cygwin else 'yadm.alt-copy'
-
     if setting is not None:
-        os.system(' '.join(yadm_cmd('config', option, str(setting))))
+        os.system(' '.join(yadm_cmd('config', 'yadm.alt-copy', str(setting))))
 
     expected_content = f'test_alt_copy##os.{tst_sys}'
 
diff --git a/yadm b/yadm
index 5155eba..7a1bf93 100755
--- a/yadm
+++ b/yadm
@@ -514,9 +514,6 @@ function alt() {
   local do_copy=0
   [ "$(config --bool yadm.alt-copy)" == "true" ] && do_copy=1
 
-  # deprecated yadm.cygwin-copy option (to be removed)
-  [ "$(config --bool yadm.cygwin-copy)" == "true" ] && do_copy=1
-
   cd_work "Alternates" || return
 
   # determine all tracked files
diff --git a/yadm.1 b/yadm.1
index 3212a3a..8a15ef0 100644
--- a/yadm.1
+++ b/yadm.1
@@ -372,12 +372,6 @@ The following is the full list of supported configurations:
 If set to "true", alternate files will be copies instead of symbolic links.
 This might be desirable, because some systems may not properly support
 symlinks.
-
-NOTE: The deprecated
-.I yadm.cygwin-copy
-option used by older versions of yadm has been replaced by
-.IR yadm.alt-copy .
-The old option will be removed in the next version of yadm.
 .TP
 .B yadm.auto-alt
 Disable the automatic linking described in the section ALTERNATES. If disabled,