You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: admin_manual/issues/applying_patch.rst
+15-12Lines changed: 15 additions & 12 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -8,14 +8,15 @@ Obtaining a patch
8
8
If you found a related pull request on GitHub that solves your issue, or you want to help developers and verify a fix works, you can get a patch for the pull request.
9
9
10
10
1. Using https://github.com/nextcloud/server/pull/26396 as an example.
11
-
2. Append ``.patch`` to the URL: https://github.com/nextcloud/server/pull/26396.patch
12
-
3. Download the patch to your server and follow the `Applying a patch`_ steps.
13
-
4. If you are on an older Nextcloud version, you might first need to go to the correct backported patch for your version.
11
+
2. Append ``.diff`` to the URL: https://github.com/nextcloud/server/pull/26396.diff
12
+
3. Download the patch to your server e.g. via ``wget https://github.com/nextcloud/server/pull/26396.diff`` (this will place ``26396.diff`` in the local directory)
13
+
4. Follow the `Applying a patch`_ steps.
14
+
5. If you are on an older Nextcloud version, you might first need to go to the correct backported patch for your version.
14
15
15
16
.. image:: images/getting-a-patch-from-github.png
16
17
:alt:backportbot-nextcloud linking to the pull request for an older version.
17
18
18
-
5. You can find the appropriate version by looking for a link posted by ``backportbot-nextcloud`` to the backport pull request for your release, or by checking for a developer comment with a manual backport link. Use the ``.patch`` URL of that backport PR.
19
+
6. You can find the appropriate version by looking for a link posted by ``backportbot-nextcloud`` to the backport pull request for your release, or by checking for a developer comment with a manual backport link. Use the ``.diff`` URL of that backport PR.
19
20
20
21
Applying a patch
21
22
----------------
@@ -24,32 +25,34 @@ Patching server
24
25
^^^^^^^^^^^^^^^
25
26
26
27
1. Navigate to your Nextcloud server's root directory (the one that contains the ``status.php`` file).
27
-
2. Apply the patch with the following command::
28
+
2. Download the patch to your server e.g. via ``wget https://github.com/nextcloud/server/pull/26396.diff`` (this will place ``26396.diff`` in the local directory)
29
+
3. Apply the patch with the following command::
28
30
29
-
patch -p 1 < /path/to/the/file.patch
31
+
patch -p 1 < ./26396.diff
30
32
31
-
3. Alternatively, if the patch command is not available, use::
33
+
4. Alternatively, if the patch command is not available, use::
32
34
33
-
git apply --check /path/to/the/file.diff
34
-
git apply /path/to/the/file.diff
35
+
git apply --check ./26396.diff
36
+
git apply ./26396.diff
35
37
36
38
Patching apps
37
39
^^^^^^^^^^^^^
38
40
39
41
1. Navigate to the root of the app (usually ``apps/[APPID]/``). If you cannot find the app there, use the ``sudo -E -u www-data php occ app:getpath APPID`` command to find the path.
40
-
2. Apply the patch with the same command as in `Patching server`_.
42
+
2. Download the patch to your server e.g. via ``wget https://github.com/nextcloud/<app>/pull/26396.diff`` (this will place ``26396.diff`` in the local directory)
43
+
3. Apply the patch with the same command as in `Patching server`_.
41
44
42
45
Reverting a patch
43
46
-----------------
44
47
45
48
1. Navigate to the directory where you applied the patch.
46
49
2. Revert the patch with the ``-R`` option::
47
50
48
-
patch -R -p 1 < /path/to/the/file.patch
51
+
patch -R -p 1 < ./26396.diff
49
52
50
53
3. Alternatively, if the patch command is not available, use::
0 commit comments