diff options
| author | Gregory Heytings | 2022-11-02 14:20:39 +0000 |
|---|---|---|
| committer | Gregory Heytings | 2022-11-02 15:22:33 +0100 |
| commit | b035db7a313ce541cb49f9a4f57167a6a44b80c9 (patch) | |
| tree | 6e90f285c9ff84b73484695b5e42ccbcf9834631 /admin/git-bisect-start | |
| parent | 1f1dac9b3b35c38676358d440be88bea477c1bb3 (diff) | |
| download | emacs-b035db7a313ce541cb49f9a4f57167a6a44b80c9.tar.gz emacs-b035db7a313ce541cb49f9a4f57167a6a44b80c9.zip | |
; * admin/git-bisect-start: Improve commentary.
Diffstat (limited to 'admin/git-bisect-start')
| -rwxr-xr-x | admin/git-bisect-start | 45 |
1 files changed, 27 insertions, 18 deletions
diff --git a/admin/git-bisect-start b/admin/git-bisect-start index 18dca4bef8b..cf0c8cde410 100755 --- a/admin/git-bisect-start +++ b/admin/git-bisect-start | |||
| @@ -1,31 +1,40 @@ | |||
| 1 | #!/bin/bash | 1 | #!/bin/bash |
| 2 | 2 | ||
| 3 | # Start a git bisection, and prune the branches that are the result of | 3 | ### Start a git bisection, and prune the branches that are the result of |
| 4 | # merging external trees into the Emacs repository. | 4 | ### merging external trees into the Emacs repository. |
| 5 | 5 | ||
| 6 | # Copyright (C) 2022 Free Software Foundation, Inc. | 6 | ## Copyright (C) 2022 Free Software Foundation, Inc. |
| 7 | 7 | ||
| 8 | # This file is part of GNU Emacs. | 8 | ## This file is part of GNU Emacs. |
| 9 | 9 | ||
| 10 | # GNU Emacs is free software: you can redistribute it and/or modify | 10 | ## GNU Emacs is free software: you can redistribute it and/or modify |
| 11 | # it under the terms of the GNU General Public License as published by | 11 | ## it under the terms of the GNU General Public License as published by |
| 12 | # the Free Software Foundation, either version 3 of the License, or | 12 | ## the Free Software Foundation, either version 3 of the License, or |
| 13 | # (at your option) any later version. | 13 | ## (at your option) any later version. |
| 14 | 14 | ||
| 15 | # GNU Emacs is distributed in the hope that it will be useful, | 15 | ## GNU Emacs is distributed in the hope that it will be useful, |
| 16 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | 16 | ## but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 17 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 17 | ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 18 | # GNU General Public License for more details. | 18 | ## GNU General Public License for more details. |
| 19 | 19 | ||
| 20 | # You should have received a copy of the GNU General Public License | 20 | ## You should have received a copy of the GNU General Public License |
| 21 | # along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. | 21 | ## along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. |
| 22 | |||
| 23 | ### Commentary: | ||
| 24 | |||
| 25 | ## Marking the last commits of external tree merges as "good" ensures | ||
| 26 | ## that all the commits between the external tree root and the merge | ||
| 27 | ## (excluding the merge-commit itself) are regarded as "good", so "git | ||
| 28 | ## bisect" will never descend into these branches, which only have the | ||
| 29 | ## files of the external tree, and in which Emacs can therefore not be | ||
| 30 | ## built. The last commit is the parent of the merge commit in the | ||
| 31 | ## external tree, that is, the parent of the merge commit that is not | ||
| 32 | ## on master. | ||
| 33 | |||
| 34 | ### Code: | ||
| 22 | 35 | ||
| 23 | git bisect start | 36 | git bisect start |
| 24 | 37 | ||
| 25 | # Prune commits 1e5b753bf4..806734c1b1 introduced by 0186faf2a1 (Eglot | 38 | # Prune commits 1e5b753bf4..806734c1b1 introduced by 0186faf2a1 (Eglot |
| 26 | # merge on Oct 20 2022) | 39 | # merge on Oct 20 2022) |
| 27 | # The following tells Git that all the commits between Eglot's root | ||
| 28 | # and its merge to master (excluding the merge-commit itself) are | ||
| 29 | # regarded as "good", so "git bisect" will never descend into the | ||
| 30 | # Eglot's branch, because that branch doesn't have all the files. | ||
| 31 | git bisect good 806734c1b1f433de43d59d9a5e3a1e89d64315f6 | 40 | git bisect good 806734c1b1f433de43d59d9a5e3a1e89d64315f6 |