Re: Feature Request: Branch-Aware Submodules

2016-09-01 Thread Hedges Alexander
Since I don’t want to change any history in the subproject, to me the most expected behavior would be: git submodule update —-recursive with submodule.*.update set to the command: ``` #!/bin/bash branches=`git branch --points-at "$1"` if [ ! $branches ] ; then git checkout "$1" echo

Re: Feature Request: Branch-Aware Submodules

2016-08-28 Thread Jacob Keller
On Fri, Aug 26, 2016 at 8:12 AM, Hedges Alexander wrote: >> On 25 Aug 2016, at 19:45, Stefan Beller wrote: >> [1] https://github.com/jlehmann/git-submod-enhancements >> which has some attempts for checkout including the submodules. >> I also tried

Re: Feature Request: Branch-Aware Submodules

2016-08-26 Thread Hedges Alexander
> On 25 Aug 2016, at 19:45, Stefan Beller wrote: > > +cc Jacob and Lars who work with submodules as well. > > On Thu, Aug 25, 2016 at 2:00 AM, Hedges Alexander > wrote: >> >> Right now updating a submodule in a topic branch and merging it into

Re: Feature Request: Branch-Aware Submodules

2016-08-25 Thread Junio C Hamano
Stefan Beller writes: >>> So you roughly do >>> >>> git checkout -b new-topic >>> # change the submodule to point at the latest upstream version: >>> git submodule update --remote >>> git commit -a -m "update submodule" >>> git checkout master >>> git

Re: Feature Request: Branch-Aware Submodules

2016-08-25 Thread Stefan Beller
On Thu, Aug 25, 2016 at 1:50 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> +cc Jacob and Lars who work with submodules as well. >> >> On Thu, Aug 25, 2016 at 2:00 AM, Hedges Alexander >> wrote: >>> >>> Right now updating

Re: Feature Request: Branch-Aware Submodules

2016-08-25 Thread Junio C Hamano
Stefan Beller writes: > +cc Jacob and Lars who work with submodules as well. > > On Thu, Aug 25, 2016 at 2:00 AM, Hedges Alexander > wrote: >> >> Right now updating a submodule in a topic branch and merging it into master >> will not change the

Re: Feature Request: Branch-Aware Submodules

2016-08-25 Thread Junio C Hamano
"Hedges Alexander" writes: > Right now updating a submodule in a topic branch and merging it into master > will not change the submodule index in master leading to at least two commit > for the same change (one in any active branch). I stopped reading here because I am

Re: Feature Request: Branch-Aware Submodules

2016-08-25 Thread Stefan Beller
+cc Jacob and Lars who work with submodules as well. On Thu, Aug 25, 2016 at 2:00 AM, Hedges Alexander wrote: > > Right now updating a submodule in a topic branch and merging it into master > will not change the submodule index in master leading to at least two commit >

Feature Request: Branch-Aware Submodules

2016-08-25 Thread Hedges Alexander
Dear Git Developers, First of all, thanks for this great project, it has made my life a lot easier as a developer! I'm writing this email to suggest some improvements to git submodules. In my eyes how git handles submodules could be improved to be more intuitive to a novice and require less