[Libre-soc-bugs] [Bug 440] Changes committed to submodule need to be pushed to submodule's upstream repo

bugzilla-daemon at libre-soc.org bugzilla-daemon at libre-soc.org
Tue Jul 28 19:34:26 BST 2020


--- Comment #8 from Luke Kenneth Casson Leighton <lkcl at lkcl.net> ---
(In reply to Jacob Lifshay from comment #7)

> oh well, everyone makes mistakes.

sorry i forgot to mention i'd spoken with cole a couple days ago and witnessed
a hilarious head-desk-banging session when describing the lovely simple
solution :)

i had suspected that git format-patch and git am apply (designed for offline
emailable git synchronisation) were capable of preserving the git commit
hashes, not having used it in a while, and ironically confirmed this works,
only yesterday.

by the round-the-houses route of putting the commit into a formatpatch, when i
did the pull on the submodule it went "oh you already have this i will just
update the git log then, ho hum nothing to see here, moving on, yawn"

if however i had done straight "patch" with a diff then definitely there would
be two conflicting commits with the exact same content and that would have been
Bad (tm).

You are receiving this mail because:
You are on the CC list for the bug.

More information about the libre-soc-bugs mailing list