RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-01-31 12:41:49 +01:00
Code Issues Projects Releases Wiki Activity

git bisect docs: formatting tweaks

Browse Source
This commit is contained in:
Nico Weber 2020-02-10 15:47:46 -05:00
parent 73bd7a141e
commit 482673ffdb
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
docs/GitBisecting.rst
View File

@ -88,10 +88,13 @@ Here's how LLVM's history currently looks:
``A`` is the first commit in LLVM ever, ``97724f18c79c``.
``B`` is the first commit in MLIR, ``aed0d21a62db``. ``D`` is the merge commit
that merged MLIR into the main LLVM repository, ``0f0d0ed1c78f``. ``C`` is the
last commit in MLIR before it got merged, ``0f0d0ed1c78f^2``. (The ``^n``
modifier selects the n'th parent of a merge commit.)
``B`` is the first commit in MLIR, ``aed0d21a62db``.
``D`` is the merge commit that merged MLIR into the main LLVM repository,
``0f0d0ed1c78f``.
``C`` is the last commit in MLIR before it got merged, ``0f0d0ed1c78f^2``. (The
``^n`` modifier selects the n'th parent of a merge commit.)
``git bisect`` goes through all parent revisions. Due to the way MLIR was
merged, at every revision at ``C`` or earlier, *only* the ``mlir/`` directory
@ -103,8 +106,12 @@ follow the first parent of ``D``.
The best workaround is to pass a list of directories to ``git bisect``:
If you know the bug is due to a change in llvm, clang, or compiler-rt, use
``git bisect start -- clang llvm compiler-rt``. That way, the commits in
``mlir`` are never evaluated.
.. code-block:: bash
git bisect start -- clang llvm compiler-rt
That way, the commits in ``mlir`` are never evaluated.
Alternatively, ``git bisect skip aed0d21a6 aed0d21a6..0f0d0ed1c78f`` explicitly
skips all commits on that branch. It takes 1.5 minutes to run on a fast