On Tue, Apr 28, 2020 at 10:21 AM Christopher Schultz < ch...@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 > > <ch...@christopherschultz.net > > <mailto:ch...@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-unsubscr...@tomcat.apache.org > > <mailto:dev-unsubscr...@tomcat.apache.org> For additional commands, > > e-mail: dev-h...@tomcat.apache.org > > <mailto:dev-h...@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-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > >
