procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add a script to ease bisecting.

Browse source 
* admin/git-bisect-start: New script.

* admin/notes/repo (Bisecting): Mention the script.

* admin/emake: Add a Copyright blurb.
This commit is contained in:
Gregory Heytings 2022-11-01 18:20:00 +00:00
parent 22e8a77583
commit 208f0578d1
3 changed files with 47 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
admin/emake
View file

@ -1,5 +1,22 @@
#!/bin/bash
# Copyright (C) 2022 Free Software Foundation, Inc.
# This file is part of GNU Emacs.
# GNU Emacs is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# GNU Emacs is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
# This script is meant to be used as ./admin/emake, and will compile
# the Emacs tree with virtually all of the informational messages
# removed, and with errors/warnings highlighted in red. It'll give a

27
admin/git-bisect-start Executable file
View file

@ -0,0 +1,27 @@
#!/bin/bash
# Start a git bisection, and prune the branches that are the result of
# merging external trees into the Emacs repository.
# Copyright (C) 2022 Free Software Foundation, Inc.
# This file is part of GNU Emacs.
# GNU Emacs is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# GNU Emacs is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
git bisect start
# Prune commits 1e5b753bf4..806734c1b1 introduced by 0186faf2a1 (Eglot
# merge on Oct 20 2022)
git bisect good 806734c1b1

7
admin/notes/repo
View file

@ -128,10 +128,9 @@ again.
This is a semi-automated way to find the revision that introduced a bug.
Browse 'git help bisect' for technical instructions.
Depending on what you want to do, it can be helpful to start bisecing
with the option '--first-parent', like `git bisect start
--first-parent', which makes bisect ignore commits coming into a
branch from merges.
It is recommended to start a bisection with the admin/git-bisect-start
script. This script prunes the branches that are the result of
merging external trees into the Emacs repository.
* Maintaining ChangeLog history