search

jens-maus / amissl

:closed_lock_with_key: AmiSSL is the AmigaOS/MorphOS/AROS port of OpenSSL. It wraps the full functionality of OpenSSL into a full-fledged Amiga shared library that makes it possible for Amiga applications to use the full OpenSSL API through a standard Amiga shared library interface (e.g. web browsers wanting to support HTTPS, etc.)...
Apache License 2.0
88 stars 15 forks source link

Merging new OpenSSL as described in README.update-openssl fails #40

Closed Futaura closed 4 years ago

Futaura commented 4 years ago

Trying to merge in OpenSSL 1.1.1a as described in the README.update-openssl file results in the following error:

$ git subtree pull --prefix openssl --squash https://github.com/openssl/openssl.git OpenSSL_1_1_1a
From https://github.com/openssl/openssl
 * tag                     OpenSSL_1_1_1a -> FETCH_HEAD
fatal: ambiguous argument '3ff855e048b924a2db5133e596da9c25e9aaee27^0': unknown revision or path not in the working tree.
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'
could not rev-parse split hash 3ff855e048b924a2db5133e596da9c25e9aaee27 from commit d62c916138a4ec9be10f9417f912692727013ee7
Can't squash-merge: 'openssl' was never added.

Any idea what it means?

Originally posted by @salass00 in https://github.com/jens-maus/amissl/issues/24#issuecomment-448168656

Futaura commented 4 years ago

I'm now working, and so far struggling, to resolve this issue. I'm still getting the same error when trying to merge in OpenSSL_1_1_1d. I don't know what @jens-maus did to get around it last time. Did you ever figure this out @salass00 ?

I'm going to try working backwards to see when it did last work in case it gives some clues as to if something got messed up somewhere.

Futaura commented 4 years ago

Now fixed by @jens-maus