Merge settings with Posh-Git because I'm tired of having dueling sets

[Jaykul]

Submitting a similar set to posh-git -- could probably go further than this to integrate them, but this is enough for step one

[Jaykul]

bump

[JeremySkinner]

Hi

Sorry, I hadn't seen this pull request.

I've tried implementing it, but it doesn't seem to coexist nicely with posh-git. When both are enabled, the latest posh-git generates the following error:

Method invocation failed because [System.Management.Automation.ScriptBlock] does not contain
a method named 'op_Addition'.
At C:\Users\JSkinner\Documents\WindowsPowerShell\posh-git\GitPrompt.ps1:153 char:1
+ $Global:VcsPromptStatuses += {
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    + CategoryInfo          : InvalidOperation: (op_Addition:String) [], RuntimeException
    + FullyQualifiedErrorId : MethodNotFound

If you could take a look at fixing this then I'll consider merging it in.

Thanks

Jeremy

[Jaykul]

Yeah... They have a matching merge set that they had ignored as well.
Working on that -- or you can pull my fork, but really I need both of ya to
pull ;)
On Nov 18, 2013 1:02 AM, "Jeremy Skinner" [email protected] wrote:

Hi

Sorry, I hadn't seen this pull request.

I've tried implementing it, but it doesn't seem to coexist nicely with
posh-git. When both are enabled, the latest posh-git generates the
following error:

Method invocation failed because [System.Management.Automation.ScriptBlock] does not contain
a method named 'op_Addition'.
At C:\Users\JSkinner\Documents\WindowsPowerShell\posh-git\GitPrompt.ps1:153 char:1

• $Global:VcsPromptStatuses += {

• - CategoryInfo          : InvalidOperation: (op_Addition:String) [], RuntimeException
  - FullyQualifiedErrorId : MethodNotFound
  
  

If you could take a look at fixing this then I'll consider merging it in.

Thanks

Jeremy

—
Reply to this email directly or view it on GitHubhttps://github.com//pull/25#issuecomment-28683068
.

[JeremySkinner]

Does this still allow for the settings to be different for posh-hg/posh-git? For example, if I want different BeforeText/AfterText based on the repo type?