From: Michael J Gruber <git@drmicha.warpmail.net>
To: git@vger.kernel.org
Cc: Jan Beulich <JBeulich@novell.com>,
"H.J. Lu" <hjl.tools@gmail.com>, "H. Peter Anvin" <hpa@zytor.com>,
Andrew Morton <akpm@linux-foundation.org>,
Linus Torvalds <torvalds@linux-foundation.org>,
Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>
Subject: [PATCH] git-bisect.txt: example for bisecting with hotfix
Date: Mon, 14 Mar 2011 14:47:20 +0100 [thread overview]
Message-ID: <cf85600a90cea6a0a751c674b821d17d85f34c66.1300109828.git.git@drmicha.warpmail.net> (raw)
In-Reply-To: <20110314131623.119020@gmx.net>
Give an example on how to bisect when older revisions need a hotfix to
build, run or test. Triggered by the binutils/kernel issue at
http://thread.gmane.org/gmane.comp.gnu.binutils/52601/focus=1112779
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
---
Maybe this doc fix would do. Just tag the hotfix and tell people to cherry-pick it
like this. I don't think "git bisect --with-fix=hotfix" would be much simpler.
(culling kernel list from cc - don't apply this to the wrong tree :)
Documentation/git-bisect.txt | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/Documentation/git-bisect.txt b/Documentation/git-bisect.txt
index c39d957..25acf26 100644
--- a/Documentation/git-bisect.txt
+++ b/Documentation/git-bisect.txt
@@ -322,6 +322,17 @@ $ git bisect run sh -c "make || exit 125; ~/check_test_case.sh"
+
Does the same as the previous example, but on a single line.
+* Bisect with compatibility hotfix:
++
+------------
+$ git bisect start HEAD HEAD~10 -- # culprit is among the last 10
+$ git bisect run sh -c "git cherry-pick -n hotfix || exit 125; make || exit 125; ~/check_test_case.sh"
+------------
++
+Does the same as the previous example, but applies an additional patch
+before building. This is useful when your build or test environment changed so
+that older revisions may need a fix which newer ones have already.
+
Author
------
Written by Linus Torvalds <torvalds@osdl.org>
--
1.7.4.1.404.g62d316
next prev parent reply other threads:[~2011-03-14 13:51 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20110311165802.GA3508@intel.com>
[not found] ` <4D7A64670200007800035F4C@vpn.id2.novell.com>
[not found] ` <AANLkTikG8wa1Em0bEUddbYpYs2TzFFTDb95qWFJ3xSbv@mail.gmail.com>
[not found] ` <4D7DE39302000078000362E6@vpn.id2.novell.com>
[not found] ` <20110314095534.GB18058@elte.hu>
[not found] ` <20110314104131.GG6275@bubble.grove.modra.org>
[not found] ` <20110314122342.GA26825@elte.hu>
2011-03-14 13:16 ` git bisect plus fixes (was: PATCH: Add --size-check=[error|warning]) Ralf Wildenhues
2011-03-14 13:47 ` Michael J Gruber [this message]
2011-03-14 17:35 ` [PATCH] git-bisect.txt: example for bisecting with hotfix Junio C Hamano
2011-03-15 21:24 ` [PATCHv2 1/2] git-bisect.txt: streamline run presentation Michael J Gruber
2011-03-15 21:24 ` [PATCHv2 2/2] git-bisect.txt: example for bisecting with hot-fix Michael J Gruber
2011-03-14 21:00 ` [PATCH] Document 'git bisect fix' Ralf Wildenhues
2011-03-15 10:16 ` Yann Dirson
2011-03-16 9:52 ` Christian Couder
2011-03-16 11:47 ` Michael J Gruber
2011-03-16 20:35 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=cf85600a90cea6a0a751c674b821d17d85f34c66.1300109828.git.git@drmicha.warpmail.net \
--to=git@drmicha.warpmail.net \
--cc=JBeulich@novell.com \
--cc=akpm@linux-foundation.org \
--cc=git@vger.kernel.org \
--cc=hjl.tools@gmail.com \
--cc=hpa@zytor.com \
--cc=mingo@elte.hu \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).