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

[bugzilla-daemon at libre-soc.org]

https://bugs.libre-soc.org/show_bug.cgi?id=440

Cole Poirier <colepoirier at gmail.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
         Resolution|---                         |FIXED
             Status|CONFIRMED                   |RESOLVED

--- Comment #6 from Cole Poirier <colepoirier at gmail.com> ---
(In reply to Jacob Lifshay from comment #5)
> (In reply to Luke Kenneth Casson Leighton from comment #4)
> > (In reply to Jacob Lifshay from comment #2)
> > > A submodule is a full git repo, so you can add the writable version of the
> > > remote and push the commit:
> > 
> > funny.  i suggested another way, involving git format-patch and git am apply
> > which effectively achieves the same thing.
> 
> It may end up with the same content, but it doesn't give the same commit
> hash, unfortunately. The git submodule mechanism depends on having exactly
> the same commit hash.
>  
> > which ironically i just had to do last night as i did the exact same thing
> > as cole.
> > 
> > anyway. given that the same text has been added and given that the submodule
> > has moved on i'm closing this one.
> 
> I really think cole should push that commit, since people exploring the git
> history or git bisecting will have trouble if it isn't actually there.
> 
> Also, we should have it there for the sake of transparency.
> 
> reopening.

I would have committed it if I still had it. In my attempt to get the changes I
had committed to the submodule into the actual repo I deleted soc and pulled it
fresh from our git. Luke told me that instead of trying to resolve git
confusions on my own I should contact the mailing list so I don't make these
kinds of mistakes. I will endeavor to do this moving forwards. Closing.

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