[commit: ghc] master's head updated: Add default case (fixes -Werror) (4d90e44)

[Arash Rouhani]

On 2014-09-19 06:48, Gabor Greif wrote:
> Dear devs,
>
> I must admit I screwed this up again, I wanted to push on my branch
>
> git push darcs 4d90e44101559800947ce3cd7fd8704dc520b332:wip/generics-propeq-conservative
>
> but muscle memory betrayed me and I pushed like this:
>
> git push darcs 4d90e44101559800947ce3cd7fd8704dc520b332:master
>
> Sorry for the messup. How can I repair this? I did not intend to
> "merge" my work yet.
>
> It is not totally wrong though. It has three failures, but they are
> okay. I have a commit in my tree for that, but my firewall won't let
> them out (they are more than a kilobyte :-(
>
> The changes should be reviewed on the branch, and some changes are
> still expected.
>
> Second thought, how could this happen? Was this just a fast-forward of
> "master" ?
> Git seems to be a dangerous tool.
I'm also surprised by this. How can your old commits be a fast-forward 
of master? Are you sure you didn't rebase your work first? :)

Anyhow, the workflow that won't cause mistakes like this is to work *on* 
branches and not use the refspec:branch syntax and just specify the branch.

git push darcs wip/generics-propeq-conservative


When I make mistakes like this though I just quickly undo it with a 
force push. ^^

Cheers,
Arash

>
> Cheers and all help welcome, (also review comments regarding this WIP),
>
> remorsefully,
>
>      Gabor
>
> On 9/19/14, git at git.haskell.org <git at git.haskell.org> wrote:
>> Repository : ssh://git@git.haskell.org/ghc
>>
>> Branch 'master' now includes:
>>
>>       e12a6a8 Propositional equality for Datatype meta-information
>>       0a8e6fc Make constructor metadata parametrized (with intended parameter
>> <- datatype)
>>       f097b77 Implement sameConstructor
>>       cc618e6 get roles right and fix a FIXME
>>       79c7125 Actually parametrize the Constructor with the Datatype
>>       7bd4bab Supply a reasonable name (should be derived from d_name tho)
>>       09fcd70 Use 'd_name' as the name (should be derived from d_name tho)
>>       4d90e44 Add default case (fixes -Werror)
>> _______________________________________________
>> ghc-commits mailing list
>> ghc-commits at haskell.org
>> http://www.haskell.org/mailman/listinfo/ghc-commits
>>
> _______________________________________________
> ghc-devs mailing list
> ghc-devs at haskell.org
> http://www.haskell.org/mailman/listinfo/ghc-devs

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.haskell.org/pipermail/ghc-devs/attachments/20140919/717c3365/attachment.html>