search

GatorQue / git-repo-flow

Enhanced Google repo alternative that utilizes a git-flow methodology.
Apache License 2.0
6 stars 3 forks source link

Gitflow in .git/config is not updated on repo sync #7

Closed GatorQue closed 8 years ago

GatorQue commented 8 years ago

When manifest.xml file is edited and a element is added followed by a repo sync, the .git/config isn't updated with the necessary gitflow configuration elements. This issue needs to determine where this can be detected and make a call to self.flow.SetConfig(config,self.remote.name) to make this happen (where self == Project class).

smipi1 commented 8 years ago

@GatorQue ,

An alternative (maybe simpler for now), is to implement a repo flow init. git flow users are used to first calling init. We can also detect an absent or incomplete init, and apply it the first time a repo flow sub command is called.

GatorQue commented 8 years ago

That is a good suggestion, we can loop through each project on an init command and perform the Flow.SetConfig step to pre-initialize each of them.

GatorQue commented 8 years ago

Implemented by adding a repo flow init command that performs the project.flow.SetConfig call followed by a direct git flow init on each project folder (we may want to consider doing the steps provided by git flow init directly instead). See commit hash 26187f87a

GatorQue commented 8 years ago

Implemented check for develop and master branches with an error to the user if they are missing to run repo flow init. This was done in commit hash 4d3e164 and e8b5606.

smipi1 commented 8 years ago

That would be more efficient, but it may break for later versions of git flow. What do you think?

On Tue, 2 Feb 2016, 05:17 Ryan Lindeman notifications@github.com wrote:

Implemented check for develop and master branches with an error to the user if they are missing to run repo flow init. This was done in 4d3e16 and e8b560.

— Reply to this email directly or view it on GitHub https://github.com/GatorQue/git-repo-flow/issues/7#issuecomment-178362241 .

GatorQue commented 8 years ago

The code still calls git flow init, but it attempts to perform the creation of local branches for the develop and master branches before calling git flow init, hopefully causing it to be a no-op. Is this sufficient for future compatibility?

smipi1 commented 8 years ago

Should be then. Have you benchmarked the two options?

On Tue, 2 Feb 2016, 15:41 Ryan Lindeman notifications@github.com wrote:

The code still calls git flow init, but it attempts to perform the creation of local branches for the develop and master branches before calling git flow init, hopefully causing it to be a no-op. Is this sufficient for future compatibility?

— Reply to this email directly or view it on GitHub https://github.com/GatorQue/git-repo-flow/issues/7#issuecomment-178604046 .