sigh< Stupid me, didn't check the push command line, just used the
last push from history.
Sorry about the noise.
Thomas
Den 2020-08-03 kl. 17:37, skrev Soby Mathew:
Hi Thomas
From the log, Your folder seems to indicate trusted-firmware-m and you are trying to push to tf-m-tests. The trusted-firmware-m.git https://git.trustedfirmware.org/TF-M/trusted-firmware-m.git/ and tf-m-tests.git https://git.trustedfirmware.org/TF-M/tf-m-tests.git/ do not have a common ancestor. You might need to create a patch file and then apply to the tests repo manually I think.
Best Regards
Soby Mathew
*From:*TF-M tf-m-bounces@lists.trustedfirmware.org *On Behalf Of *Thomas Törnblom via TF-M *Sent:* 03 August 2020 15:43 *To:* tf-m@lists.trustedfirmware.org *Subject:* [TF-M] Fail pushing, no common ancestry
I've tried fixing a minor issue in one of my already pushed changes, but for some reason I get an error.
To avoid anything I've done today I tried to push the local repo with no changes at all since I pushed it last, and I'm still getting an issue, and it seems related to tf-m-tests
PS C:\Users\thomasto\Projects\tf-m1\trusted-firmware-m> git push ssh://review.trustedfirmware.org/TF-M/tf-m-tests.git HEAD:refs/for/master Enumerating objects: 24547, done. Counting objects: 100% (24547/24547), done. Delta compression using up to 4 threads Compressing objects: 100% (8849/8849), done. Writing objects: 100% (24547/24547), 12.14 MiB | 1.07 MiB/s, done. Total 24547 (delta 17058), reused 21946 (delta 15111), pack-reused 0 remote: Resolving deltas: 100% (17058/17058) remote: Processing changes: refs: 1, done To ssh://review.trustedfirmware.org/TF-M/tf-m-tests.git ! [remote rejected] HEAD -> refs/for/master (no common ancestry) error: failed to push some refs to 'ssh://review.trustedfirmware.org/TF-M/tf-m-tests.git'
What am I missing?
Thomas
--
*Thomas Törnblom*, /Product Engineer/ IAR Systems AB Box 23051, Strandbodgatan 1 SE-750 23 Uppsala, SWEDEN Mobile: +46 76 180 17 80 Fax: +46 18 16 78 01 E-mail: thomas.tornblom@iar.com mailto:thomas.tornblom@iar.comWebsite: www.iar.com http://www.iar.com Twitter: www.twitter.com/iarsystems http://www.twitter.com/iarsystems