Stuck again on submodules

[Simon Peyton-Jones]

aha, good catch.  It looks as if my commit for cardinality analysis somehow jiggered the Cabal tree.  I have no idea how or why.  

How can I undo that?

Simon

git log -p libraries/Cabal
commit ae3e14b731c976d7b8f7adc2c0f613db834c5ef1
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Fri May 3 14:50:58 2013 +0100

    Implement cardinality analysis
    
    This major patch implements the cardinality analysis described
    in our paper "Higher order cardinality analysis". It is joint
...snip...

diff --git a/libraries/Cabal b/libraries/Cabal
index b4d0c0f..14c5a3f 160000
--- a/libraries/Cabal
+++ b/libraries/Cabal
@@ -1 +1 @@
-Subproject commit b4d0c0f2846542dc2e2df189fe145a56ac9b30b6
+Subproject commit 14c5a3f78c00772cf54c2fd5c920a64d53e6f594

commit 0c3a9679286eb96e87905b038bf706734aed3922
Author: Ian Lynagh <ian at well-typed.com>
Date:   Sun Apr 28 21:58:16 2013 +0100

    Update Cabal


| -----Original Message-----
| From: Ian Lynagh [mailto:ian at well-typed.com]
| Sent: 09 May 2013 13:40
| To: Simon Peyton-Jones
| Cc: ghc-devs at haskell.org
| Subject: Re: Stuck again on submodules
| 
| 
| Hi Simon,
| 
| On Thu, May 09, 2013 at 12:31:22PM +0000, Simon Peyton-Jones wrote:
| > Afraid not. I'd tried "git submodule update".  The command you give is
| a no-op; libraries/Cabal is stuck on commit 14c5a3f; and that's what git
| submodule status says it should be.  But it shouldn't!
| 
| What does
| 
|     git log -p libraries/Cabal
| 
| say?
| 
| 
| Thanks
| Ian