This is a very old but unanswered question. I decided to investigate, and found that I could show that the behavior of Git is different to what the question says it is. One explanation is that Git improved the algorithm for bisect, or that the questioner made a mistake in marking commits. I wrote some code to check whether it is evaluated or not. Please read the section "Bisection Algorithm" in this article by Christian Couder."commits 107ca95.3e667f8 are ignored": Please note, that the commit you marked as "good" will not be evaluated because git already knows it to be good.Run the code below and verify that a commit with message Add menu styles. The code then tries to find the breaking change automatically.Įach commit has a test.sh which can be used (Bad)Ĭommand to run: python3 script.py """ The following code creates a git repository in '/tmp/git-repo' and populates From then on, it bisects the linear history as would be expected.(Read "Checking merge bases" from article mentioned above.) Notice that first 'Add Admin notice' is checked (line 4) because that provides the most information.As mentioned above, the question was certainly using a different version then the one I used (Question is from 2013, Git 2.11 is from 2016).Also the section "Checking merge bases" might be relevant. G.bisect('start', commit_ids, commit_ids) To test the claim that '107ca95.3e667f8 are never checked out'.Ġx3830e61: )'.format(msg=repo, test='Good' if repo else 'Bad'))Ĭommit_ids = g('rev-parse', 'HEAD').strip() #Sublime merge squash commits code It involves the step where you reapply the commit you are testing on top of your relevant master commit (which was ea3d736 in the OP's case) (And git bisect -first-parent is available with Git 2.29+ - Q4 2020) Warning: the git bisect section regarding " Automatically bisect with temporary modifications" has been updated with Git 2.25 (Q1 2020). The " git merge -no-commit" needs " -no-ff" if you do not want to move HEAD, which has been corrected in the manual page for " git bisect". (Merged by Junio C Hamano - gitster - in commit fac9ab1, ) Documentation/git-bisect.txt: add -no-ff to merge command See commit 8dd327b () by Mihail Atanassov ( matana).
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |