mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
To: linux-kernel@vger.kernel.org
Subject: Stupid git question...
Date: Fri, 11 Dec 2015 20:27:14 -0500	[thread overview]
Message-ID: <45406.1449883634@turing-police.cc.vt.edu> (raw)

[-- Attachment #1: Type: text/plain, Size: 1195 bytes --]

OK.. Here's the situation - I've got several sets of patches I'll probably
be cooking over the holidays, and I'm planning to base on linux-next (though
any other moving-target base has the same issues).

What I *want* to accomplish:

At any given point, linux-next may or may not have breakages that cause
me grief (anything from compile issues to can't-boot-to-multiuser crashes).
What's the *clean* way to accomplish the following:

<assume I have a current linux-next/master copied to my box>

git branch --track linux-next/master local-fixes

git branch --track local-fixes project-1
git branch --track local-fixes project-2
git branch --track local-fixes project-3

Basically, have some way to keep track of the small integer number of
local things that I don't want escaping if I do a 'git format-patch project-2'
or other similar thing, and so I only have to deal with doing the local
fix once.  Just dropping commits on top of linux-next doesn't seem right, as
it could get ugly the next 'git remote update'.

What are maintainers doing to deal with similar issues, where you need to
make sure that your test builds in fact contain unrelated commits needed for
the build to be testable?

[-- Attachment #2: Type: application/pgp-signature, Size: 848 bytes --]

             reply	other threads:[~2015-12-12  1:27 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-12  1:27 Valdis Kletnieks [this message]
2015-12-12  8:05 ` Jeff Kirsher
  -- strict thread matches above, loose matches on Subject: below --
2011-09-14 20:19 stupid " Bob Tracy
2011-09-14 20:22 ` Josh Boyer
2011-09-14 20:32   ` Bob Tracy
2011-09-14 20:22 ` Markus Trippelsdorf
2007-04-18 20:08 Stupid GIT question Valdis.Kletnieks
2007-04-18 20:58 ` Andreas Schwab

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=45406.1449883634@turing-police.cc.vt.edu \
    --to=valdis.kletnieks@vt.edu \
    --cc=linux-kernel@vger.kernel.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

all inboxes | Powered by JetHome®