Cherry-pick doubts and questions
Mark Geisert
mark@maxrnd.com
Sun Oct 25 07:38:41 GMT 2026
Hi Jon,
I've started this post a couple times; hopefully this one is clear...
I have some user-supplied patches I wanted to commit to both the 3.7.0
(==master ==main) and 3.6.x branches. I thought I would try using 'git
cherry-pick' for the first time.
I have a local git repository for the master branch. From there I
created a tracking branch for 3.6.x with:
git checkout -b 3.6 origin/cygwin-3_6-branch
and brought over the first victim patch with:
git cherry-pick 3883fda70d1b13e02d40613604caeb6d9962ecb4
Git reported a conflict about file cygwin/release/3.7.0 I assume because
it doesn't exist on the 3.6.x branch, so I continued with:
git rm cygwin/release/3.7.0
git cherry-pick --continue
My log shows that I next did:
git checkout master // I'm not sure why, see (3) below
git push -n // to see if it'll do what I want
git push origin HEAD:cygwin-3_6-branch // like "Pro Git" book says
And got some bland message that I wish I'd saved.
I no longer trust what 'git log' is saying about either of my branches
and I certainly won't push anything more until I recover or start these
branches over from scratch. Here are my questions...
(1) When one pushes a cherry-pick, should one expect to see a CI build
starting up before too long?
(2) Same situation, should one expect to see an entry in 'git log'
within the target branch noting the cherry-pick? (I didn't say "-x" but
will going forward.)
(3) Is it a known gotcha that if you have two mintty+bash windows open
and cd'd into the same directory of a local repository, you can't have
one window showing you the master branch while the other shows you
3.6.x? I think this is how I got confused about which branch I was in
before doing 'git push'. If you checkout in one window your next git
command in the other window duplicates that checkout.
Just today it finally dawned on me that I can use cgit to check the
current state of either/both remote branches. So I do plan to re-init
and re-create both local branches from known good remote state.
I plan to ship the patches I have pending for both branches after that,
likely using good old copy-and-paste rather than cherry-picking.
Sorry for the post length and thanks for reading.
..mark
More information about the Cygwin-developers
mailing list