From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
To: Libre-RISCV General Development <libre-riscv-dev@lists.libre-riscv.org>
Subject: Re: [libre-riscv-dev] CI passes for soc.git!!!
Date: Tue, 7 Apr 2020 01:22:16 +0100
Message-ID: <CAPweEDzcemA9oAVcdtpGtAc2woV4RuMZ8MrAU0cfNxRrm7kxYQ@mail.gmail.com> (raw)
In-Reply-To: <CAC2bXD694G4jYPwuW1KEJmW8EMZU4sjpu4anufnQ+auBiWpWgg@mail.gmail.com>
On Tuesday, April 7, 2020, Jacob Lifshay <programmerjake@gmail.com> wrote:
>
> Turns out that a later commit on master fixed it, so I pushed my
> changes to master and deleted the fix-tests branch.
ok cool.
i suspect it was the git submodules.
i believe it may be essential to do submodule updates then individual
separate commit of .gitmodules.
one way to do this: by committing groups of files *not* with git commit -a
but explicitly listing them
then finally the last commit with .gitmodules only
if a commit includes both files *and* an alteration to .gitmodules then
merging breaks.
frickin nuisance. lots of people have given up using submodules because of
this
must research it properly.
l.
--
---
crowd-funded eco-conscious hardware: https://www.crowdsupply.com/eoma68
_______________________________________________
libre-riscv-dev mailing list
libre-riscv-dev@lists.libre-riscv.org
http://lists.libre-riscv.org/mailman/listinfo/libre-riscv-dev
next prev parent reply index
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-06 0:17 [libre-riscv-dev] added CI to soc.git as well as attempting to fix all tests Jacob Lifshay
2020-04-06 0:44 ` Jacob Lifshay
2020-04-06 1:36 ` [libre-riscv-dev] CI passes for soc.git!!! Jacob Lifshay
2020-04-06 11:07 ` Luke Kenneth Casson Leighton
2020-04-06 14:37 ` Jacob Lifshay
2020-04-06 17:12 ` Luke Kenneth Casson Leighton
2020-04-06 19:15 ` Jacob Lifshay
2020-04-06 20:34 ` Luke Kenneth Casson Leighton
2020-04-07 0:07 ` Jacob Lifshay
2020-04-07 0:22 ` Luke Kenneth Casson Leighton [this message]
2020-04-06 10:36 ` [libre-riscv-dev] added CI to soc.git as well as attempting to fix all tests Luke Kenneth Casson Leighton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAPweEDzcemA9oAVcdtpGtAc2woV4RuMZ8MrAU0cfNxRrm7kxYQ@mail.gmail.com \
--to=lkcl@lkcl.net \
--cc=libre-riscv-dev@lists.libre-riscv.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Libre RISC-V Mailing list Archives (accessible via public-inbox)
Archives are clonable: git clone --mirror https://inbox.libre-soc.org/libre-riscv-dev
Example config snippet for mirrors
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git