From: alan@clueserver.org
To: git@vger.kernel.org
Cc: alan@clueserver.org
Subject: Odd problems trying to build an orphaned branch
Date: Thu, 5 Nov 2015 13:16:54 -0800 [thread overview]
Message-ID: <1bf03e2146ceb5bb36b81f1ce64354b0.squirrel@clueserver.org> (raw)
I am trying to create an orphaned branch that contains the linux-3.12.y
branch from linux-stable. Each time I try a method to make this work I
encounter a blocker that halts my progress.
I expect that at least one of these is a bug, but I am not sure.
Here is what I did. I have read the docs and tried a huge pile of
suggestions. How is this supposed to be done?
I am using git version 2.6.2.402.g2635c2b. It passes all the tests.
I created an orphan branch from 3.12-rc1. I then used git format-patch to
generate patches from 3.12-rc1 to HEAD. (Over 7000 patches.) I use git am
to apply them to the orphan branch. At patch 237 it fails to apply. (It
appears the patch is from a block of code added with a merge commit, but
it is somewhere in the middle of the block.)
Are merge commits supposed to screw up git-format-patch?
I also tried using clone with depth and --single-branch set. It ignored
the depth setting and gave me the whole branch all the way back to 2.6.x.
All the examples of shallow clones use depth=1. Is it broken for values
bigger than 1 or am I missing something?
I tried using graft and filter-branch. None of the descriptions are very
clear. None of them worked either. Filter-branch died on a commit
somewhere in 2.6 land that had no author. (Which is outside of the commits
I want to keep.)
I tried creating an orphan branch and using cherry-pick
v3.12-rc1..linux-3.12.y. It blew up on the first merge commit it hit. I
tried adding in "-m 1" to try to get it to pick a parent, but then it died
on the first commit because it was not a merge.
Why is this so hard?
All I want to do is take a branch from linux-stable and create a branch
that contains just the commits from where it was branched off of master
until it hits HEAD. That is it. All the scripts that I have seen that
claim to do just what I want break when it hits a merge or a bogus author.
(How that got into linux-stable, I have no idea. The commit is 10 year
old!)
Ideas? Do I need to create a new command? ("cake-cutter". Cut from
commit..commit and make a new branch out of it.)
next reply other threads:[~2015-11-05 21:28 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-05 21:16 alan [this message]
2015-11-06 0:18 ` Odd problems trying to build an orphaned branch Jeff King
2015-11-06 0:20 ` Jeff King
2015-11-06 6:24 ` [PATCH] filter-branch: skip index read/write when possible Jeff King
2015-11-06 18:32 ` Odd problems trying to build an orphaned branch alan
2015-11-06 19:00 ` Jeff King
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=1bf03e2146ceb5bb36b81f1ce64354b0.squirrel@clueserver.org \
--to=alan@clueserver.org \
--cc=git@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.