You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by Christopher Schultz <ch...@christopherschultz.net> on 2020/02/24 16:33:35 UTC
git-fu is weak
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
All,
I'm trying to cherry-pick a commit. The commit went through github,
merged a PR from a contributor into master. I'm trying to cherry-pick
it back into the 9.0.x branch:
$ git cherry-pick f124a9c7230227d3eaff9d2dc1c52f82ce10e03f
error: commit f124a9c7230227d3eaff9d2dc1c52f82ce10e03f is a merge but
no -m option was given.
fatal: cherry-pick failed
??
My local copy is all up-to-date, no weird local changes or anything
like that. What is a "merge", here? Supplying "-m" doesn't like the
commit id.
Any ideas?
- -chris
-----BEGIN PGP SIGNATURE-----
Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/
iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAl5T+t8ACgkQHPApP6U8
pFjwvRAAnaog8gRDB+vajg0CCXYmCvq24yO5FZNbcQSQCyTLM7WnIfFUCYanI+VG
hnSdmWcqyv2P/zHij67EyO+TmrPIqI6WLv5/xOIMHH6JYZK3eebpofwrIAoxJ5je
xM1shwvjXYss7LNs5uxVThmWg3z5KGjGX9VuQVtaROx4LvAYWPQ+ajld/KXU5qha
R7ytbDD96bgty7iiScaG7cPHYZryq3ePnhphR7nYp1RhHXUkdB//nc2PmS5166MU
NZtxbCF28T55wXifJV5ZCodHs2tJh+zu9LeYP9hgUkoAQedJ8fSMk4DnKz+RCFXB
huVArT0kuy5t2FoSweNpI9NpzoHRxnleGPsqJv20g9CcVzJqCLisyyLCxP1YUuNI
te3rtjKUY0aegTE4DbVpQg49iblnsAJyVhMQIkOhKcciM3P2ZNNOVvuiNhNzPaV+
U/uR9tB8+e0XQX5ONt1Q1L6/u4dYTuXgFRkWU0K4b1eIjfsicECgOq5lcKUlxlIe
Jl3rJx8FAZpR6AiHUoJy7tujd6/SIoSOCg9BWmfj8I2pslKpY1nFxfhSF9bhcsr3
fSPcjUZyGpZqjzgxXi2jA2XjJgqaMoyWkscRavLNv9jWKLtUNUPmpNCKPRW07HCc
hA9Fvukuq6c7Sjy9y+ZH8in7lbGtdcBYhm8+BQhbJimyLn377DI=
=Fx8W
-----END PGP SIGNATURE-----
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: git-fu is weak
Posted by Konstantin Kolinko <kn...@gmail.com>.
пн, 24 февр. 2020 г. в 19:40, Emmanuel Bourg <eb...@apache.org>:
>
> Le 24/02/2020 à 17:33, Christopher Schultz a écrit :
>
> > Any ideas?
>
> I guess you are cherry picking the merge commit, instead of the actual
> commit(s) from the PR branch.
>
https://github.com/apache/tomcat/commit/f124a9c7230227d3eaff9d2dc1c52f82ce10e03f
says: "2 parents 03b2af7 + bf2447b"
I guess that you want this commit:
https://github.com/apache/tomcat/commit/bf2447b4bd9edda25e00c7aaab9fcce455c43f2f
I am not fluent with command-line for this command, as I usually do it
via GUI (provided by TortoiseGit).
"git help cherry-pick" may help you.
Best regards,
Konstantin Kolinko
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: git-fu is weak
Posted by Emmanuel Bourg <eb...@apache.org>.
Le 24/02/2020 à 17:33, Christopher Schultz a écrit :
> Any ideas?
I guess you are cherry picking the merge commit, instead of the actual
commit(s) from the PR branch.
Emmanuel Bourg
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: git-fu is weak
Posted by Michael Osipov <mi...@apache.org>.
Am 2020-02-24 um 21:35 schrieb Christopher Schultz:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA256
>
> Michael,
>
> On 2/24/20 14:15, Michael Osipov wrote:
>> Am 2020-02-24 um 17:33 schrieb Christopher Schultz:
>>> -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256
>>>
>>> All,
>>>
>>> I'm trying to cherry-pick a commit. The commit went through
>>> github, merged a PR from a contributor into master. I'm trying to
>>> cherry-pick it back into the 9.0.x branch:
>>>
>>> $ git cherry-pick f124a9c7230227d3eaff9d2dc1c52f82ce10e03f error:
>>> commit f124a9c7230227d3eaff9d2dc1c52f82ce10e03f is a merge but no
>>> -m option was given. fatal: cherry-pick failed
>>>
>>> ??
>>>
>>> My local copy is all up-to-date, no weird local changes or
>>> anything like that. What is a "merge", here? Supplying "-m"
>>> doesn't like the commit id.
>>
>>> $ git log --graph * commit
>>> 900ed3ef96080ec378fea452dcd748bf3bfa0ec0 (HEAD -> master,
>>> origin/master, origin/HEAD) | Author: Christopher Schultz
>>> <ch...@christopherschultz.net> | Date: 2020-02-24 17:26:31
>>> +0100 | | Add changelog entry. | * commit
>>> f124a9c7230227d3eaff9d2dc1c52f82ce10e03f |\ Merge: 03b2af7473
>>> bf2447b4bd | | Author: Christopher Schultz
>>> <ch...@christopherschultz.net> | | Date: 2020-02-24 17:21:31
>>> +0100 | | | | Merge pull request #240 from ThStock/master |
>>> | | | Added extension point for custom delta requests | | | *
>>> commit bf2447b4bd9edda25e00c7aaab9fcce455c43f2f | | Author:
>>> Thomas Stock <ts...@novomind.com> | | Date: 2020-02-13
>>> 12:55:32 +0100 | | | | Added extension point for custom delta
>>> requests | |
>>
>> You can't cherry-pick merge commits.
>
> WTF is a merge-commit?
A merge commit reconciles two or more tree where history has dirverged
from each other.
>> Try to avoid merge commits.
>
> I clicked "Merge PR" in GitHub. I don't believe I had any choices in
> the matter.
I already assumed so. GitHub is stupid and creates this useless commit.
On the right-hand side of that button is a menu button which does rebase
and merge. See here:
https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/merging-a-pull-request
>> In most cases all they do is to add clutter with zero benefit [1].
> Single-click to accept a PR is great. I see that is CAN cause (me)
> problems, but it shouldn't be this hard.
It is hard, if you don't know what it is doing it exactly.
>> Rebase the branch you want to merge on top of the targer branch,
>> switch and then merge.
> I don't control the source's github fork, so that's a no-go.
That's not a no go. You mostly have this:
> Add more commits by pushing to the session-manager-persist-authentication branch on cklein05/tomcat.
If you don't, request the PR creator to do the rebase, alternatively use
your clone from Gitbox, create a branch and merge the foreign branch. If
everything is fine, merge into master. With that, you have full control.
This is how we merge PR in Maven.
M
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: git-fu is weak
Posted by Christopher Schultz <ch...@christopherschultz.net>.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Michael,
On 2/24/20 14:15, Michael Osipov wrote:
> Am 2020-02-24 um 17:33 schrieb Christopher Schultz:
>> -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256
>>
>> All,
>>
>> I'm trying to cherry-pick a commit. The commit went through
>> github, merged a PR from a contributor into master. I'm trying to
>> cherry-pick it back into the 9.0.x branch:
>>
>> $ git cherry-pick f124a9c7230227d3eaff9d2dc1c52f82ce10e03f error:
>> commit f124a9c7230227d3eaff9d2dc1c52f82ce10e03f is a merge but no
>> -m option was given. fatal: cherry-pick failed
>>
>> ??
>>
>> My local copy is all up-to-date, no weird local changes or
>> anything like that. What is a "merge", here? Supplying "-m"
>> doesn't like the commit id.
>
>> $ git log --graph * commit
>> 900ed3ef96080ec378fea452dcd748bf3bfa0ec0 (HEAD -> master,
>> origin/master, origin/HEAD) | Author: Christopher Schultz
>> <ch...@christopherschultz.net> | Date: 2020-02-24 17:26:31
>> +0100 | | Add changelog entry. | * commit
>> f124a9c7230227d3eaff9d2dc1c52f82ce10e03f |\ Merge: 03b2af7473
>> bf2447b4bd | | Author: Christopher Schultz
>> <ch...@christopherschultz.net> | | Date: 2020-02-24 17:21:31
>> +0100 | | | | Merge pull request #240 from ThStock/master |
>> | | | Added extension point for custom delta requests | | | *
>> commit bf2447b4bd9edda25e00c7aaab9fcce455c43f2f | | Author:
>> Thomas Stock <ts...@novomind.com> | | Date: 2020-02-13
>> 12:55:32 +0100 | | | | Added extension point for custom delta
>> requests | |
>
> You can't cherry-pick merge commits.
WTF is a merge-commit?
> Try to avoid merge commits.
I clicked "Merge PR" in GitHub. I don't believe I had any choices in
the matter.
> In most cases all they do is to add clutter with zero benefit [1].
Single-click to accept a PR is great. I see that is CAN cause (me)
problems, but it shouldn't be this hard.
> Rebase the branch you want to merge on top of the targer branch,
> switch and then merge.
I don't control the source's github fork, so that's a no-go.
> This is trivial via shell.
Other than clicking "Merge PR" in github, I do everything via CLI.
- -chris
-----BEGIN PGP SIGNATURE-----
Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/
iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAl5UM38ACgkQHPApP6U8
pFiBtw//Yq9O6JwZyECcNZxT+nSaXu8ih1TQd5d9X89PnMEoi/1TX1e/3destk/A
FoZr1Q6X/jOr3wnwDEVv6BbWaDwli6lR2swZDjENi2UeyqUTVHPmSV/q5cj5VOjs
5At7HjOA2FPQJ7oEfw7NSqKs20a4qFhtjJ+CfosfrsbQzTe6fBo9uSAgOXxzAsm+
+IZzCv1moj7037ps0UrmBkWEiwb2zRRj7rqtaZS+M/zUr10WItH2Qpb7RphExcdm
2RDbJjNYWHVDUYOjHAVrPEUiw83gxpOnH3dqJwoXqdtDLkbtLA5xNhmxg+o/MWlN
2S5d1739vBrTZFowXS0aGyZNH3rFTqO9jKsv8LIhBBIA2iioGw7gu3tU+OSI0fZR
Ad039m48FfjSRtQKO+Ne03+vOBp64grG4B9KaloAhzt86bb/jlsZYf21M4bcwVVW
zqjMy6FyUqnWPVYRW0V6f59b/OH3ZcBAjj2MYBF+r6OscrS7m//Tm8aEEysksZbF
orBj6n80XNGwn4jJYFW4W4MMVSTED5uUh38irnIiObK7zdIriWeARouktxumOT2d
faA6Ozf5ZIXxJdbafbSnOeX+/XnoiupPHpR7/hRhc3aHlz0gbIBHzPIzTi+nYma1
L/s7vmvbjDpZZNzAsUncAwt+H1PxD22Xa5gWN+aSpuijPlIQbnM=
=6LUI
-----END PGP SIGNATURE-----
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: git-fu is weak
Posted by Michael Osipov <mi...@apache.org>.
Am 2020-02-24 um 17:33 schrieb Christopher Schultz:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA256
>
> All,
>
> I'm trying to cherry-pick a commit. The commit went through github,
> merged a PR from a contributor into master. I'm trying to cherry-pick
> it back into the 9.0.x branch:
>
> $ git cherry-pick f124a9c7230227d3eaff9d2dc1c52f82ce10e03f
> error: commit f124a9c7230227d3eaff9d2dc1c52f82ce10e03f is a merge but
> no -m option was given.
> fatal: cherry-pick failed
>
> ??
>
> My local copy is all up-to-date, no weird local changes or anything
> like that. What is a "merge", here? Supplying "-m" doesn't like the
> commit id.
> $ git log --graph
> * commit 900ed3ef96080ec378fea452dcd748bf3bfa0ec0 (HEAD -> master, origin/master, origin/HEAD)
> | Author: Christopher Schultz <ch...@christopherschultz.net>
> | Date: 2020-02-24 17:26:31 +0100
> |
> | Add changelog entry.
> |
> * commit f124a9c7230227d3eaff9d2dc1c52f82ce10e03f
> |\ Merge: 03b2af7473 bf2447b4bd
> | | Author: Christopher Schultz <ch...@christopherschultz.net>
> | | Date: 2020-02-24 17:21:31 +0100
> | |
> | | Merge pull request #240 from ThStock/master
> | |
> | | Added extension point for custom delta requests
> | |
> | * commit bf2447b4bd9edda25e00c7aaab9fcce455c43f2f
> | | Author: Thomas Stock <ts...@novomind.com>
> | | Date: 2020-02-13 12:55:32 +0100
> | |
> | | Added extension point for custom delta requests
> | |
You can't cherry-pick merge commits.
Try to avoid merge commits. In most cases all they do is to add clutter
with zero benefit [1]. Rebase the branch you want to merge on top of the
targer branch, switch and then merge.
This is trivial via shell.
[1]
http://lists.llvm.org/pipermail/llvm-dev/2019-January/129723.html?source=techstories.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: git-fu is (still) weak
Posted by Martin Grigorov <mg...@apache.org>.
Hi Chris,
On Tue, Apr 28, 2020 at 5:58 PM Christopher Schultz <
chris@christopherschultz.net> wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA256
>
> Coty,
>
> On 4/28/20 10:45, Coty Sutherland wrote:
> >
> >
> > On Tue, Apr 28, 2020 at 10:21 AM Christopher Schultz
> > <chris@christopherschultz.net
> > <ma...@christopherschultz.net>>
> wrote:
> >
> > Rémy,
> >
> > On 4/27/20 18:41, Rémy Maucherat wrote:
> >> On Tue, Apr 28, 2020 at 12:21 AM Christopher Schultz
> >> <chris@christopherschultz.net
> >> <ma...@christopherschultz.net>
> >> <mailto:chris@christopherschultz.net
> > <ma...@christopherschultz.net>>> wrote:
> >
> >> All,
> >
> >> I tried again to commit to tc10 branch, got commit id
> >> 8dddc11512fbd3b91ed9d737a42e4b8415458ddf.
> >
> >> Moving to tc9 branch:
> >
> >> $ git cherry-pick -n 8dddc11512fbd3b91ed9d737a42e4b8415458ddf
> >> fatal: bad object 8dddc11512fbd3b91ed9d737a42e4b8415458ddf
> >
> >> - From tc10:
> >
> >> $ git remote -v origin https://github.com/apache/tomcat (fetch)
> >> origin https://github.com/apache/tomcat (push)
> >
> >> - From tc9.0.x:
> >
> >> $ git remote -v origin https://github.com/apache/tomcat (fetch)
> >> origin https://github.com/apache/tomcat (push)
> >
> >> My 9.0.x local is all up-to-date with github, and github can see
> >> the commit in tc10.
> >
> >> Other than manually handing the diffs myself, I have no idea
> >> what to do, next. :(
> >
> >
> >>> I tried and it looked "ok" to me.
> >
> > Okay, what did you do? When I try to cherry-pick from 10 -> 9 I
> > still get the "bad object" error.
> >
> > When cherry-picking your commits from 9.0.x -> 8.5.x, I get a
> > merge-conflict (of course) because you have already merged them.
> >
> > Did I do something weird with the first commit?
> >
> > Maybe I don't have my branches in order?
> >
> > - From my tomcat-trunk (10) directory:
> >
> > $ git branch -a 9.0.x * master remotes/origin/7.0.x
> > remotes/origin/8.5.x remotes/origin/9.0.x
> > remotes/origin/BZ-63636/tomcat-8.5.x
> > remotes/origin/BZ-63636/tomcat-9.0.x remotes/origin/BZ-63681/8.5.x
> > remotes/origin/BZ-63681/9.0.x remotes/origin/BZ-63835/8.5.x
> > remotes/origin/BZ-63835/9.0.x remotes/origin/HEAD -> origin/master
> > remotes/origin/master
> >
> > - From my tomcat-9.0.x directory:
> >
> > $ git branch -a * 9.0.x master remotes/origin/9.0.x
> >
> > - From my tomcat-8.5.x directory:
> >
> > $ git branch -a * 8.5.x remotes/origin/7.0.x remotes/origin/8.5.x
> > remotes/origin/9.0.x remotes/origin/BZ-63681/8.5.x
> > remotes/origin/BZ-63681/9.0.x remotes/origin/BZ-63835/9.0.x
> > remotes/origin/HEAD -> origin/master remotes/origin/master
> >
> > My 9.0.x checkout seems "light".
> >
> >
> >> Have you tried a `git fetch origin master` from your 9.0 dir?
> >> That'll update the gitdb with new objects and refs from master,
> >> which should include the one you're trying to pick. That's the
> >> only thing I can think of given that you know your object ID is
> >> correct and present in master on upstream :)
>
> That got 'er goin'!
>
> It definitely fetched a bunch of stuff, but no new files, etc.
> (because becasue I was "up-to-date"). How can I be "up-to-date"
> without being "up-to-date"? :(
>
I see these options for you:
1) don't use several directories for the different branches.
Use just one and switch between branches:
git checkout master / git checkout 9.0.x / git checkout 8.5.x
2) use https://git-scm.com/docs/git-worktree if you prefer to have separate
folder for each branch
>
> Maybe now I can go back and merge the original commits from this
> thread from February.
>
> - -chris
> -----BEGIN PGP SIGNATURE-----
> Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/
>
> iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAl6oRIAACgkQHPApP6U8
> pFhtsA/9HHIvXZSbOsJuiBSkc0mBLonbtnvu5SOGizvcHZwPymfQgv+SC4yxiam+
> oAXEcBOfXnFG+bdBeD80F16xQOXDOT1ndSwMASA2LzdG2iDqSVVD2DvoqX3Sna3N
> +5Rp40GpIpctVLaz6rp/xTey9pZhFGy+qAjV6lssykU2Dm0trh8JNsWW4qd5Dd14
> RjLSVPN3fmxJ71hXJ3s5X8AufJmxi/TnMfC5h883WpyCM6Wsd1S7E4joXLPXt3LT
> qt82OBCpG23TIAM3CWeBykuKtbpnQ7eSmvMUPiBf8mG/6YoiBoGwuswsZPpDnLj6
> 6j4ni9IjSbPbbt7n5DBFa+QDZ6huIWH5iKcrX27ytQxVDHgDK5J9evHaTK9DbdqW
> xdFdpJ5q2swC+EhZmzz524jQWWcXsUIR0kABtT8MRlW33/5Q23m9ImBu9u58Ep+m
> vGmg8wCezCXAybCYQ86yjVICIINCd4GErrqh5KPbzMfOmTrvi0CTiqiJl9bsLdXr
> MpgbLlKzuaOswFVeI/KbfkKquWZedQVB9Ult2fDNtpRPuqxpjeyJAgu4gTtuwXy4
> +Mr+YFO9zaS49wxBo92L7ZqVn2tYPiMdzxj+39xMKwt5lj+76gq9Iyn7leKxrEZM
> skqHJql7EgIwZ+xTVPlAdtERvbq6FkBHAnJxqAYDydkTVSC7CKY=
> =9c6q
> -----END PGP SIGNATURE-----
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
>
Re: git-fu is (still) weak
Posted by Coty Sutherland <cs...@apache.org>.
On Tue, Apr 28, 2020 at 10:58 AM Christopher Schultz <
chris@christopherschultz.net> wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA256
>
> Coty,
>
> On 4/28/20 10:45, Coty Sutherland wrote:
> >
> >
> > On Tue, Apr 28, 2020 at 10:21 AM Christopher Schultz
> > <chris@christopherschultz.net
> > <ma...@christopherschultz.net>>
> wrote:
> >
> > Rémy,
> >
> > On 4/27/20 18:41, Rémy Maucherat wrote:
> >> On Tue, Apr 28, 2020 at 12:21 AM Christopher Schultz
> >> <chris@christopherschultz.net
> >> <ma...@christopherschultz.net>
> >> <mailto:chris@christopherschultz.net
> > <ma...@christopherschultz.net>>> wrote:
> >
> >> All,
> >
> >> I tried again to commit to tc10 branch, got commit id
> >> 8dddc11512fbd3b91ed9d737a42e4b8415458ddf.
> >
> >> Moving to tc9 branch:
> >
> >> $ git cherry-pick -n 8dddc11512fbd3b91ed9d737a42e4b8415458ddf
> >> fatal: bad object 8dddc11512fbd3b91ed9d737a42e4b8415458ddf
> >
> >> - From tc10:
> >
> >> $ git remote -v origin https://github.com/apache/tomcat (fetch)
> >> origin https://github.com/apache/tomcat (push)
> >
> >> - From tc9.0.x:
> >
> >> $ git remote -v origin https://github.com/apache/tomcat (fetch)
> >> origin https://github.com/apache/tomcat (push)
> >
> >> My 9.0.x local is all up-to-date with github, and github can see
> >> the commit in tc10.
> >
> >> Other than manually handing the diffs myself, I have no idea
> >> what to do, next. :(
> >
> >
> >>> I tried and it looked "ok" to me.
> >
> > Okay, what did you do? When I try to cherry-pick from 10 -> 9 I
> > still get the "bad object" error.
> >
> > When cherry-picking your commits from 9.0.x -> 8.5.x, I get a
> > merge-conflict (of course) because you have already merged them.
> >
> > Did I do something weird with the first commit?
> >
> > Maybe I don't have my branches in order?
> >
> > - From my tomcat-trunk (10) directory:
> >
> > $ git branch -a 9.0.x * master remotes/origin/7.0.x
> > remotes/origin/8.5.x remotes/origin/9.0.x
> > remotes/origin/BZ-63636/tomcat-8.5.x
> > remotes/origin/BZ-63636/tomcat-9.0.x remotes/origin/BZ-63681/8.5.x
> > remotes/origin/BZ-63681/9.0.x remotes/origin/BZ-63835/8.5.x
> > remotes/origin/BZ-63835/9.0.x remotes/origin/HEAD -> origin/master
> > remotes/origin/master
> >
> > - From my tomcat-9.0.x directory:
> >
> > $ git branch -a * 9.0.x master remotes/origin/9.0.x
> >
> > - From my tomcat-8.5.x directory:
> >
> > $ git branch -a * 8.5.x remotes/origin/7.0.x remotes/origin/8.5.x
> > remotes/origin/9.0.x remotes/origin/BZ-63681/8.5.x
> > remotes/origin/BZ-63681/9.0.x remotes/origin/BZ-63835/9.0.x
> > remotes/origin/HEAD -> origin/master remotes/origin/master
> >
> > My 9.0.x checkout seems "light".
> >
> >
> >> Have you tried a `git fetch origin master` from your 9.0 dir?
> >> That'll update the gitdb with new objects and refs from master,
> >> which should include the one you're trying to pick. That's the
> >> only thing I can think of given that you know your object ID is
> >> correct and present in master on upstream :)
>
> That got 'er goin'!
>
Woo! \o/ I'm glad that worked.
> It definitely fetched a bunch of stuff, but no new files, etc.
> (because becasue I was "up-to-date"). How can I be "up-to-date"
> without being "up-to-date"? :(
>
You were doing a `git pull` (derived from your note about being "Already up
to date"), which was only fetching and merging the current branch when you
needed to fetch object/refs from a different branch and then pick one of
those commits from that branch. Since it was only doing the current branch,
you are technically "up to date". If you tried to `git pull origin master`
then that would fetch all the objects/refs from master while also merging
(bring the new files down) which is not what you want :) Using `git fetch`
is the best way to get up to date references without actually updating the
code base you're working with.
HTH
> Maybe now I can go back and merge the original commits from this
> thread from February.
>
> - -chris
> -----BEGIN PGP SIGNATURE-----
> Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/
>
> iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAl6oRIAACgkQHPApP6U8
> pFhtsA/9HHIvXZSbOsJuiBSkc0mBLonbtnvu5SOGizvcHZwPymfQgv+SC4yxiam+
> oAXEcBOfXnFG+bdBeD80F16xQOXDOT1ndSwMASA2LzdG2iDqSVVD2DvoqX3Sna3N
> +5Rp40GpIpctVLaz6rp/xTey9pZhFGy+qAjV6lssykU2Dm0trh8JNsWW4qd5Dd14
> RjLSVPN3fmxJ71hXJ3s5X8AufJmxi/TnMfC5h883WpyCM6Wsd1S7E4joXLPXt3LT
> qt82OBCpG23TIAM3CWeBykuKtbpnQ7eSmvMUPiBf8mG/6YoiBoGwuswsZPpDnLj6
> 6j4ni9IjSbPbbt7n5DBFa+QDZ6huIWH5iKcrX27ytQxVDHgDK5J9evHaTK9DbdqW
> xdFdpJ5q2swC+EhZmzz524jQWWcXsUIR0kABtT8MRlW33/5Q23m9ImBu9u58Ep+m
> vGmg8wCezCXAybCYQ86yjVICIINCd4GErrqh5KPbzMfOmTrvi0CTiqiJl9bsLdXr
> MpgbLlKzuaOswFVeI/KbfkKquWZedQVB9Ult2fDNtpRPuqxpjeyJAgu4gTtuwXy4
> +Mr+YFO9zaS49wxBo92L7ZqVn2tYPiMdzxj+39xMKwt5lj+76gq9Iyn7leKxrEZM
> skqHJql7EgIwZ+xTVPlAdtERvbq6FkBHAnJxqAYDydkTVSC7CKY=
> =9c6q
> -----END PGP SIGNATURE-----
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
>
Re: git-fu is (still) weak
Posted by Christopher Schultz <ch...@christopherschultz.net>.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Coty,
On 4/28/20 10:45, Coty Sutherland wrote:
>
>
> On Tue, Apr 28, 2020 at 10:21 AM Christopher Schultz
> <chris@christopherschultz.net
> <ma...@christopherschultz.net>>
wrote:
>
> Rémy,
>
> On 4/27/20 18:41, Rémy Maucherat wrote:
>> On Tue, Apr 28, 2020 at 12:21 AM Christopher Schultz
>> <chris@christopherschultz.net
>> <ma...@christopherschultz.net>
>> <mailto:chris@christopherschultz.net
> <ma...@christopherschultz.net>>> wrote:
>
>> All,
>
>> I tried again to commit to tc10 branch, got commit id
>> 8dddc11512fbd3b91ed9d737a42e4b8415458ddf.
>
>> Moving to tc9 branch:
>
>> $ git cherry-pick -n 8dddc11512fbd3b91ed9d737a42e4b8415458ddf
>> fatal: bad object 8dddc11512fbd3b91ed9d737a42e4b8415458ddf
>
>> - From tc10:
>
>> $ git remote -v origin https://github.com/apache/tomcat (fetch)
>> origin https://github.com/apache/tomcat (push)
>
>> - From tc9.0.x:
>
>> $ git remote -v origin https://github.com/apache/tomcat (fetch)
>> origin https://github.com/apache/tomcat (push)
>
>> My 9.0.x local is all up-to-date with github, and github can see
>> the commit in tc10.
>
>> Other than manually handing the diffs myself, I have no idea
>> what to do, next. :(
>
>
>>> I tried and it looked "ok" to me.
>
> Okay, what did you do? When I try to cherry-pick from 10 -> 9 I
> still get the "bad object" error.
>
> When cherry-picking your commits from 9.0.x -> 8.5.x, I get a
> merge-conflict (of course) because you have already merged them.
>
> Did I do something weird with the first commit?
>
> Maybe I don't have my branches in order?
>
> - From my tomcat-trunk (10) directory:
>
> $ git branch -a 9.0.x * master remotes/origin/7.0.x
> remotes/origin/8.5.x remotes/origin/9.0.x
> remotes/origin/BZ-63636/tomcat-8.5.x
> remotes/origin/BZ-63636/tomcat-9.0.x remotes/origin/BZ-63681/8.5.x
> remotes/origin/BZ-63681/9.0.x remotes/origin/BZ-63835/8.5.x
> remotes/origin/BZ-63835/9.0.x remotes/origin/HEAD -> origin/master
> remotes/origin/master
>
> - From my tomcat-9.0.x directory:
>
> $ git branch -a * 9.0.x master remotes/origin/9.0.x
>
> - From my tomcat-8.5.x directory:
>
> $ git branch -a * 8.5.x remotes/origin/7.0.x remotes/origin/8.5.x
> remotes/origin/9.0.x remotes/origin/BZ-63681/8.5.x
> remotes/origin/BZ-63681/9.0.x remotes/origin/BZ-63835/9.0.x
> remotes/origin/HEAD -> origin/master remotes/origin/master
>
> My 9.0.x checkout seems "light".
>
>
>> Have you tried a `git fetch origin master` from your 9.0 dir?
>> That'll update the gitdb with new objects and refs from master,
>> which should include the one you're trying to pick. That's the
>> only thing I can think of given that you know your object ID is
>> correct and present in master on upstream :)
That got 'er goin'!
It definitely fetched a bunch of stuff, but no new files, etc.
(because becasue I was "up-to-date"). How can I be "up-to-date"
without being "up-to-date"? :(
Maybe now I can go back and merge the original commits from this
thread from February.
- -chris
-----BEGIN PGP SIGNATURE-----
Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/
iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAl6oRIAACgkQHPApP6U8
pFhtsA/9HHIvXZSbOsJuiBSkc0mBLonbtnvu5SOGizvcHZwPymfQgv+SC4yxiam+
oAXEcBOfXnFG+bdBeD80F16xQOXDOT1ndSwMASA2LzdG2iDqSVVD2DvoqX3Sna3N
+5Rp40GpIpctVLaz6rp/xTey9pZhFGy+qAjV6lssykU2Dm0trh8JNsWW4qd5Dd14
RjLSVPN3fmxJ71hXJ3s5X8AufJmxi/TnMfC5h883WpyCM6Wsd1S7E4joXLPXt3LT
qt82OBCpG23TIAM3CWeBykuKtbpnQ7eSmvMUPiBf8mG/6YoiBoGwuswsZPpDnLj6
6j4ni9IjSbPbbt7n5DBFa+QDZ6huIWH5iKcrX27ytQxVDHgDK5J9evHaTK9DbdqW
xdFdpJ5q2swC+EhZmzz524jQWWcXsUIR0kABtT8MRlW33/5Q23m9ImBu9u58Ep+m
vGmg8wCezCXAybCYQ86yjVICIINCd4GErrqh5KPbzMfOmTrvi0CTiqiJl9bsLdXr
MpgbLlKzuaOswFVeI/KbfkKquWZedQVB9Ult2fDNtpRPuqxpjeyJAgu4gTtuwXy4
+Mr+YFO9zaS49wxBo92L7ZqVn2tYPiMdzxj+39xMKwt5lj+76gq9Iyn7leKxrEZM
skqHJql7EgIwZ+xTVPlAdtERvbq6FkBHAnJxqAYDydkTVSC7CKY=
=9c6q
-----END PGP SIGNATURE-----
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: git-fu is (still) weak
Posted by Coty Sutherland <cs...@apache.org>.
On Tue, Apr 28, 2020 at 10:21 AM Christopher Schultz <
chris@christopherschultz.net> wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA256
>
> Rémy,
>
> On 4/27/20 18:41, Rémy Maucherat wrote:
> > On Tue, Apr 28, 2020 at 12:21 AM Christopher Schultz
> > <chris@christopherschultz.net
> > <ma...@christopherschultz.net>>
> wrote:
> >
> > All,
> >
> > I tried again to commit to tc10 branch, got commit id
> > 8dddc11512fbd3b91ed9d737a42e4b8415458ddf.
> >
> > Moving to tc9 branch:
> >
> > $ git cherry-pick -n 8dddc11512fbd3b91ed9d737a42e4b8415458ddf
> > fatal: bad object 8dddc11512fbd3b91ed9d737a42e4b8415458ddf
> >
> > - From tc10:
> >
> > $ git remote -v origin https://github.com/apache/tomcat (fetch)
> > origin https://github.com/apache/tomcat (push)
> >
> > - From tc9.0.x:
> >
> > $ git remote -v origin https://github.com/apache/tomcat (fetch)
> > origin https://github.com/apache/tomcat (push)
> >
> > My 9.0.x local is all up-to-date with github, and github can see
> > the commit in tc10.
> >
> > Other than manually handing the diffs myself, I have no idea what
> > to do, next. :(
> >
> >
> >> I tried and it looked "ok" to me.
>
> Okay, what did you do? When I try to cherry-pick from 10 -> 9 I still
> get the "bad object" error.
>
> When cherry-picking your commits from 9.0.x -> 8.5.x, I get a
> merge-conflict (of course) because you have already merged them.
>
> Did I do something weird with the first commit?
>
> Maybe I don't have my branches in order?
>
> - From my tomcat-trunk (10) directory:
>
> $ git branch -a
> 9.0.x
> * master
> remotes/origin/7.0.x
> remotes/origin/8.5.x
> remotes/origin/9.0.x
> remotes/origin/BZ-63636/tomcat-8.5.x
> remotes/origin/BZ-63636/tomcat-9.0.x
> remotes/origin/BZ-63681/8.5.x
> remotes/origin/BZ-63681/9.0.x
> remotes/origin/BZ-63835/8.5.x
> remotes/origin/BZ-63835/9.0.x
> remotes/origin/HEAD -> origin/master
> remotes/origin/master
>
> - From my tomcat-9.0.x directory:
>
> $ git branch -a
> * 9.0.x
> master
> remotes/origin/9.0.x
>
> - From my tomcat-8.5.x directory:
>
> $ git branch -a
> * 8.5.x
> remotes/origin/7.0.x
> remotes/origin/8.5.x
> remotes/origin/9.0.x
> remotes/origin/BZ-63681/8.5.x
> remotes/origin/BZ-63681/9.0.x
> remotes/origin/BZ-63835/9.0.x
> remotes/origin/HEAD -> origin/master
> remotes/origin/master
>
> My 9.0.x checkout seems "light".
>
Have you tried a `git fetch origin master` from your 9.0 dir? That'll
update the gitdb with new objects and refs from master, which should
include the one you're trying to pick. That's the only thing I can think of
given that you know your object ID is correct and present in master on
upstream :)
> Thanks,
> - -chris
>
> > On 2/24/20 11:33, Christopher Schultz wrote:
> >> All,
> >
> >> I'm trying to cherry-pick a commit. The commit went through
> >> github, merged a PR from a contributor into master. I'm trying
> >> to cherry-pick it back into the 9.0.x branch:
> >
> >> $ git cherry-pick f124a9c7230227d3eaff9d2dc1c52f82ce10e03f
> >> error: commit f124a9c7230227d3eaff9d2dc1c52f82ce10e03f is a merge
> >> but no -m option was given. fatal: cherry-pick failed
> >
> >> ??
> >
> >> My local copy is all up-to-date, no weird local changes or
> >> anything like that. What is a "merge", here? Supplying "-m"
> >> doesn't like the commit id.
> >
> >> Any ideas?
> >
> >> -chris
> >
> >
> >
> - ---------------------------------------------------------------------
> > To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> > <ma...@tomcat.apache.org> For additional commands,
> > e-mail: dev-help@tomcat.apache.org
> > <ma...@tomcat.apache.org>
> >
> -----BEGIN PGP SIGNATURE-----
> Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/
>
> iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAl6oO7kACgkQHPApP6U8
> pFgZTg//WzVb7BJyj9EKcwMm/k+tlNyZqGCH8uTMhntjFkUb9aHHLT/9PhMdBizS
> bu4dIB8MtqwxSFv+jrMypccHyRGSx8OFI8Ti0BIC42whhz8AW8BLJ2JSWZrGv+lL
> cHPxoosd/dFA4Ft4Acj8GG2WFeG9IUrf+vBbYC2y3jp8oRIvWFSFZQzG0Slt9Rv4
> J4NUIZHkuGGQP88cey1UOw/09T/4wtTm0mFcmyjnVrXDHjrXG3CkMiwU3fo/FOyj
> GmpYDEZXgVgDtUgLMG3kSynqJ4XUbRCEJJQ2nEpphFRA+qa9julCRU/D+NdLw9Ya
> 7MOWDWFiE7oRsUyU0qgK/GhMw0mQpmXrJuAQLyM2LaaUJ1ZZ5mr/Xqw1cuWJOYCW
> TZqNXhyki8XKJSxkNlBSIMouafeX3prX8A2m8erPy83RJx5d7/T1uZNHO86Vd7Qh
> ijFbAdyuICcZUPjgF/TK3AHQCVZpqQZHd/oyEVpWwdM7okhVVjoMI+WXft16oQO/
> B468o8llMLE7vTAxzB9dCSOw9wpqoaPTtkd9fH20xPGWTWii0Hkk4WrWDwoUtWbO
> xdFgCLQAd2fgVnwuSpOD5c2GeJoKD/Fc4D/JkJo5+bWVKJ7es2kCnT3xBVbDQj0T
> Tx2HJ+B0OmCKP5df6f7SYDVxtVJ15J+BgXK5msJpIZumkassfN0=
> =bp2k
> -----END PGP SIGNATURE-----
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
>
Re: git-fu is (still) weak
Posted by Christopher Schultz <ch...@christopherschultz.net>.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Rémy,
On 4/27/20 18:41, Rémy Maucherat wrote:
> On Tue, Apr 28, 2020 at 12:21 AM Christopher Schultz
> <chris@christopherschultz.net
> <ma...@christopherschultz.net>>
wrote:
>
> All,
>
> I tried again to commit to tc10 branch, got commit id
> 8dddc11512fbd3b91ed9d737a42e4b8415458ddf.
>
> Moving to tc9 branch:
>
> $ git cherry-pick -n 8dddc11512fbd3b91ed9d737a42e4b8415458ddf
> fatal: bad object 8dddc11512fbd3b91ed9d737a42e4b8415458ddf
>
> - From tc10:
>
> $ git remote -v origin https://github.com/apache/tomcat (fetch)
> origin https://github.com/apache/tomcat (push)
>
> - From tc9.0.x:
>
> $ git remote -v origin https://github.com/apache/tomcat (fetch)
> origin https://github.com/apache/tomcat (push)
>
> My 9.0.x local is all up-to-date with github, and github can see
> the commit in tc10.
>
> Other than manually handing the diffs myself, I have no idea what
> to do, next. :(
>
>
>> I tried and it looked "ok" to me.
Okay, what did you do? When I try to cherry-pick from 10 -> 9 I still
get the "bad object" error.
When cherry-picking your commits from 9.0.x -> 8.5.x, I get a
merge-conflict (of course) because you have already merged them.
Did I do something weird with the first commit?
Maybe I don't have my branches in order?
- From my tomcat-trunk (10) directory:
$ git branch -a
9.0.x
* master
remotes/origin/7.0.x
remotes/origin/8.5.x
remotes/origin/9.0.x
remotes/origin/BZ-63636/tomcat-8.5.x
remotes/origin/BZ-63636/tomcat-9.0.x
remotes/origin/BZ-63681/8.5.x
remotes/origin/BZ-63681/9.0.x
remotes/origin/BZ-63835/8.5.x
remotes/origin/BZ-63835/9.0.x
remotes/origin/HEAD -> origin/master
remotes/origin/master
- From my tomcat-9.0.x directory:
$ git branch -a
* 9.0.x
master
remotes/origin/9.0.x
- From my tomcat-8.5.x directory:
$ git branch -a
* 8.5.x
remotes/origin/7.0.x
remotes/origin/8.5.x
remotes/origin/9.0.x
remotes/origin/BZ-63681/8.5.x
remotes/origin/BZ-63681/9.0.x
remotes/origin/BZ-63835/9.0.x
remotes/origin/HEAD -> origin/master
remotes/origin/master
My 9.0.x checkout seems "light".
Thanks,
- -chris
> On 2/24/20 11:33, Christopher Schultz wrote:
>> All,
>
>> I'm trying to cherry-pick a commit. The commit went through
>> github, merged a PR from a contributor into master. I'm trying
>> to cherry-pick it back into the 9.0.x branch:
>
>> $ git cherry-pick f124a9c7230227d3eaff9d2dc1c52f82ce10e03f
>> error: commit f124a9c7230227d3eaff9d2dc1c52f82ce10e03f is a merge
>> but no -m option was given. fatal: cherry-pick failed
>
>> ??
>
>> My local copy is all up-to-date, no weird local changes or
>> anything like that. What is a "merge", here? Supplying "-m"
>> doesn't like the commit id.
>
>> Any ideas?
>
>> -chris
>
>
>
- ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> <ma...@tomcat.apache.org> For additional commands,
> e-mail: dev-help@tomcat.apache.org
> <ma...@tomcat.apache.org>
>
-----BEGIN PGP SIGNATURE-----
Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/
iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAl6oO7kACgkQHPApP6U8
pFgZTg//WzVb7BJyj9EKcwMm/k+tlNyZqGCH8uTMhntjFkUb9aHHLT/9PhMdBizS
bu4dIB8MtqwxSFv+jrMypccHyRGSx8OFI8Ti0BIC42whhz8AW8BLJ2JSWZrGv+lL
cHPxoosd/dFA4Ft4Acj8GG2WFeG9IUrf+vBbYC2y3jp8oRIvWFSFZQzG0Slt9Rv4
J4NUIZHkuGGQP88cey1UOw/09T/4wtTm0mFcmyjnVrXDHjrXG3CkMiwU3fo/FOyj
GmpYDEZXgVgDtUgLMG3kSynqJ4XUbRCEJJQ2nEpphFRA+qa9julCRU/D+NdLw9Ya
7MOWDWFiE7oRsUyU0qgK/GhMw0mQpmXrJuAQLyM2LaaUJ1ZZ5mr/Xqw1cuWJOYCW
TZqNXhyki8XKJSxkNlBSIMouafeX3prX8A2m8erPy83RJx5d7/T1uZNHO86Vd7Qh
ijFbAdyuICcZUPjgF/TK3AHQCVZpqQZHd/oyEVpWwdM7okhVVjoMI+WXft16oQO/
B468o8llMLE7vTAxzB9dCSOw9wpqoaPTtkd9fH20xPGWTWii0Hkk4WrWDwoUtWbO
xdFgCLQAd2fgVnwuSpOD5c2GeJoKD/Fc4D/JkJo5+bWVKJ7es2kCnT3xBVbDQj0T
Tx2HJ+B0OmCKP5df6f7SYDVxtVJ15J+BgXK5msJpIZumkassfN0=
=bp2k
-----END PGP SIGNATURE-----
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: git-fu is (still) weak
Posted by Rémy Maucherat <re...@apache.org>.
On Tue, Apr 28, 2020 at 12:21 AM Christopher Schultz <
chris@christopherschultz.net> wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA256
>
> All,
>
> I tried again to commit to tc10 branch, got commit id
> 8dddc11512fbd3b91ed9d737a42e4b8415458ddf.
>
> Moving to tc9 branch:
>
> $ git cherry-pick -n 8dddc11512fbd3b91ed9d737a42e4b8415458ddf
> fatal: bad object 8dddc11512fbd3b91ed9d737a42e4b8415458ddf
>
> - From tc10:
>
> $ git remote -v
> origin https://github.com/apache/tomcat (fetch)
> origin https://github.com/apache/tomcat (push)
>
> - From tc9.0.x:
>
> $ git remote -v
> origin https://github.com/apache/tomcat (fetch)
> origin https://github.com/apache/tomcat (push)
>
> My 9.0.x local is all up-to-date with github, and github can see the
> commit in tc10.
>
> Other than manually handing the diffs myself, I have no idea what to
> do, next. :(
>
I tried and it looked "ok" to me.
Rémy
>
> - -chris
>
> On 2/24/20 11:33, Christopher Schultz wrote:
> > All,
> >
> > I'm trying to cherry-pick a commit. The commit went through
> > github, merged a PR from a contributor into master. I'm trying to
> > cherry-pick it back into the 9.0.x branch:
> >
> > $ git cherry-pick f124a9c7230227d3eaff9d2dc1c52f82ce10e03f error:
> > commit f124a9c7230227d3eaff9d2dc1c52f82ce10e03f is a merge but no
> > -m option was given. fatal: cherry-pick failed
> >
> > ??
> >
> > My local copy is all up-to-date, no weird local changes or
> > anything like that. What is a "merge", here? Supplying "-m" doesn't
> > like the commit id.
> >
> > Any ideas?
> >
> > -chris
> >
> -----BEGIN PGP SIGNATURE-----
> Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/
>
> iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAl6nWssACgkQHPApP6U8
> pFgE0RAAkCCN0ai+byJh3TGyQRWGP1WTUc92UO7kbVCFiJTe/1s6XtUOwPguiJ87
> rbIAZRsKDefVJVZguad6mXQEkQEnAXQF3w5TvLt8abGbOKi1z4UG+ONwHdptwQfZ
> 83vIexa4mV2yw45mpTPqYIZ16eke41x+YV1cZea0iEqp7eQ12HN71je7E0HzEGFN
> lDCf+sBHGjBeJ63LSsZ/hIU+LoWgmGBmc0j9GK1UlsL0LhpH6Cz/dXoyqsCxIXl4
> 3BIP5FmSK+3d+f5ciVUrAQJCH6SF0yYEx4+JtUVIUl1lJN5OwvZsyhnHHX4OqiHg
> Qp0Zx7h8+mj83MAwZDDyyNcABoF4hyrEMoS9w/I2+zCNrs7RGZGKqvZRIwR2IhCR
> rdhfTisc9nkmwZhg+Yt485l0m/IOO/XNqijZ8O4oxUz14BmDHrUoIYlnT3BEKe4q
> 7roZpz78JmcCDlFDkEcvaZKJ68vww0CFZsoWXTGDCZuckJQaAOz6Jf9470g2Y79/
> WHtxmBtLNimexrbLN4COYsVoPQbk1X1xGhi2fYqyMNjVGV2cqdOo2I+VAurfRhnh
> wpoLzN2mNh0qi23pdyrRsSyRB/KdAszVa2fjIR7WD74AamNy/CzMrydx0b2OpB8k
> UbQ/uRuFR7q7jm5N2d0fELMWRPV03RcQ9iIFxtvPE0kGLLvyjm4=
> =LDJJ
> -----END PGP SIGNATURE-----
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
>
Re: git-fu is (still) weak
Posted by Christopher Schultz <ch...@christopherschultz.net>.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
All,
I tried again to commit to tc10 branch, got commit id
8dddc11512fbd3b91ed9d737a42e4b8415458ddf.
Moving to tc9 branch:
$ git cherry-pick -n 8dddc11512fbd3b91ed9d737a42e4b8415458ddf
fatal: bad object 8dddc11512fbd3b91ed9d737a42e4b8415458ddf
- From tc10:
$ git remote -v
origin https://github.com/apache/tomcat (fetch)
origin https://github.com/apache/tomcat (push)
- From tc9.0.x:
$ git remote -v
origin https://github.com/apache/tomcat (fetch)
origin https://github.com/apache/tomcat (push)
My 9.0.x local is all up-to-date with github, and github can see the
commit in tc10.
Other than manually handing the diffs myself, I have no idea what to
do, next. :(
- -chris
On 2/24/20 11:33, Christopher Schultz wrote:
> All,
>
> I'm trying to cherry-pick a commit. The commit went through
> github, merged a PR from a contributor into master. I'm trying to
> cherry-pick it back into the 9.0.x branch:
>
> $ git cherry-pick f124a9c7230227d3eaff9d2dc1c52f82ce10e03f error:
> commit f124a9c7230227d3eaff9d2dc1c52f82ce10e03f is a merge but no
> -m option was given. fatal: cherry-pick failed
>
> ??
>
> My local copy is all up-to-date, no weird local changes or
> anything like that. What is a "merge", here? Supplying "-m" doesn't
> like the commit id.
>
> Any ideas?
>
> -chris
>
-----BEGIN PGP SIGNATURE-----
Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/
iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAl6nWssACgkQHPApP6U8
pFgE0RAAkCCN0ai+byJh3TGyQRWGP1WTUc92UO7kbVCFiJTe/1s6XtUOwPguiJ87
rbIAZRsKDefVJVZguad6mXQEkQEnAXQF3w5TvLt8abGbOKi1z4UG+ONwHdptwQfZ
83vIexa4mV2yw45mpTPqYIZ16eke41x+YV1cZea0iEqp7eQ12HN71je7E0HzEGFN
lDCf+sBHGjBeJ63LSsZ/hIU+LoWgmGBmc0j9GK1UlsL0LhpH6Cz/dXoyqsCxIXl4
3BIP5FmSK+3d+f5ciVUrAQJCH6SF0yYEx4+JtUVIUl1lJN5OwvZsyhnHHX4OqiHg
Qp0Zx7h8+mj83MAwZDDyyNcABoF4hyrEMoS9w/I2+zCNrs7RGZGKqvZRIwR2IhCR
rdhfTisc9nkmwZhg+Yt485l0m/IOO/XNqijZ8O4oxUz14BmDHrUoIYlnT3BEKe4q
7roZpz78JmcCDlFDkEcvaZKJ68vww0CFZsoWXTGDCZuckJQaAOz6Jf9470g2Y79/
WHtxmBtLNimexrbLN4COYsVoPQbk1X1xGhi2fYqyMNjVGV2cqdOo2I+VAurfRhnh
wpoLzN2mNh0qi23pdyrRsSyRB/KdAszVa2fjIR7WD74AamNy/CzMrydx0b2OpB8k
UbQ/uRuFR7q7jm5N2d0fELMWRPV03RcQ9iIFxtvPE0kGLLvyjm4=
=LDJJ
-----END PGP SIGNATURE-----
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org