Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
LLVM bpEVL
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Lorenzo Albano
LLVM bpEVL
Commits
e4e9e106
Commit
e4e9e106
authored
5 years ago
by
Nico Weber
Browse files
Options
Downloads
Patches
Plain Diff
git bisect docs: formatting tweaks
parent
660b0d7f
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
llvm/docs/GitBisecting.rst
+13
-6
13 additions, 6 deletions
llvm/docs/GitBisecting.rst
with
13 additions
and
6 deletions
llvm/docs/GitBisecting.rst
+
13
−
6
View file @
e4e9e106
...
@@ -88,10 +88,13 @@ Here's how LLVM's history currently looks:
...
@@ -88,10 +88,13 @@ Here's how LLVM's history currently looks:
``A`` is the first commit in LLVM ever, ``97724f18c79c``.
``A`` is the first commit in LLVM ever, ``97724f18c79c``.
``B`` is the first commit in MLIR, ``aed0d21a62db``. ``D`` is the merge commit
``B`` is the first commit in MLIR, ``aed0d21a62db``.
that merged MLIR into the main LLVM repository, ``0f0d0ed1c78f``. ``C`` is the
last commit in MLIR before it got merged, ``0f0d0ed1c78f^2``. (The ``^n``
``D`` is the merge commit that merged MLIR into the main LLVM repository,
modifier selects the n'th parent of a merge commit.)
``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
``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
merged, at every revision at ``C`` or earlier, *only* the ``mlir/`` directory
...
@@ -103,8 +106,12 @@ follow the first parent of ``D``.
...
@@ -103,8 +106,12 @@ follow the first parent of ``D``.
The best workaround is to pass a list of directories to ``git bisect``:
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
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
Alternatively, ``git bisect skip aed0d21a6 aed0d21a6..0f0d0ed1c78f`` explicitly
skips all commits on that branch. It takes 1.5 minutes to run on a fast
skips all commits on that branch. It takes 1.5 minutes to run on a fast
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment