Submodule woe

Wed Sep 4 07:38:56 UTC 2019

Thanks.  I tried `git submodule init` and `git submodule update`, but not `git submodule sync`.

Anyway it seems to happen just once in each tree so I can probably live with it.

S

From: Spiwack, Arnaud <arnaud.spiwack at tweag.io>
Sent: 04 September 2019 08:21
To: Jakub Zalewski <jakzale at gmail.com>
Cc: Simon Peyton Jones <simonpj at microsoft.com>; ghc-devs at haskell.org
Subject: Re: Submodule woe

This doesn't appear to happen in a fresh clone.

As I wasn't able to reproduce, it's a shot in the dark. But `git submodule sync && git submodule update` might solve the issue without needed to clone GHC afresh.

On Wed, Sep 4, 2019 at 12:12 AM Jakub Zalewski <jakzale at gmail.com<mailto:jakzale at gmail.com>> wrote:
Looks like a commited merge conflict in `.gitmodules` file.

wt., 3 wrz 2019 o 21:19 Simon Peyton Jones via ghc-devs <ghc-devs at haskell.org<mailto:ghc-devs at haskell.org>> napisał(a):
Friends
This stuff (below) is happening in every tree I have.   Does anyone have any ideas?
Simon

simonpj at MSRC-9870733:~/code/HEAD$ git pull

remote: Enumerating objects: 196, done.

remote: Counting objects: 100% (196/196), done.

remote: Compressing objects: 100% (82/82), done.

remote: Total 196 (delta 117), reused 187 (delta 113)

Receiving objects: 100% (196/196), 357.97 KiB | 563.00 KiB/s, done.

Resolving deltas: 100% (117/117), completed with 82 local objects.

From gitlab.haskell.org:ghc/ghc

   c0956c14f4..11679e5bec  master                        -> origin/master

* [new branch]            wip/T14137                    -> origin/wip/T14137

* [new branch]            wip/T16152                    -> origin/wip/T16152

* [new branch]            wip/T16502                    -> origin/wip/T16502

   6abfa85bad..bbfb686cc8  wip/T17056                    -> origin/wip/T17056

+ 707b8dcbed...fe9a1c238f wip/marge_bot_batch_merge_job -> origin/wip/marge_bot_batch_merge_job  (forced update)

* [new branch]            wip/over-poly-kinds           -> origin/wip/over-poly-kinds

   54829af722..02218d79d7  wip/pmcheck-ncon              -> origin/wip/pmcheck-ncon

* [new branch]            wip/spj-cam-HEAD              -> origin/wip/spj-cam-HEAD

+ 3daf83ecda...2f8f334f2d wip/top-level-kind-signatures -> origin/wip/top-level-kind-signatures  (forced update)

warning: Submodule in commit d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee at path: '(null)' collides with a submodule named the same. Skipping it.

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.libraries/binary.path'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.libraries/binary.url'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.libraries/binary.ignore'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.libraries/bytestring.path'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.libraries/bytestring.url'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.libraries/bytestring.ignore'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.libraries/Cabal.path'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.libraries/Cabal.url'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.libraries/Cabal.ignore'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.libraries/containers.path'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.libraries/containers.url'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.libraries/containers.ignore'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.libraries/haskeline.path'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.libraries/haskeline.url'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.libraries/haskeline.ignore'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.libraries/pretty.path'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.libraries/pretty.url'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.libraries/pretty.ignore'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.libraries/terminfo.path'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.libraries/terminfo.url'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.libraries/terminfo.ignore'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.libraries/transformers.path'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.libraries/transformers.url'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.libraries/transformers.ignore'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.libraries/xhtml.path'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.libraries/xhtml.url'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.libraries/xhtml.ignore'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.libraries/Win32.path'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.libraries/Win32.url'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.libraries/Win32.ignore'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.libraries/time.path'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.libraries/time.url'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.libraries/time.ignore'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.libraries/array.path'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.libraries/array.url'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.libraries/array.ignore'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.libraries/deepseq.path'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.libraries/deepseq.url'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.libraries/deepseq.ignore'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.libraries/directory.path'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.libraries/directory.url'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.libraries/directory.ignore'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.libraries/filepath.path'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.libraries/filepath.url'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.libraries/filepath.ignore'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.libraries/hpc.path'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.libraries/hpc.url'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.libraries/hpc.ignore'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.libraries/parsec.path'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.libraries/parsec.url'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.libraries/parsec.ignore'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.libraries/text.path'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.libraries/text.url'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.libraries/text.ignore'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.libraries/mtl.path'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.libraries/mtl.url'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.libraries/mtl.ignore'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.libraries/process.path'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.libraries/process.url'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.libraries/process.ignore'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.libraries/unix.path'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.libraries/unix.url'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.libraries/unix.ignore'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.libraries/parallel.path'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.libraries/parallel.url'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.libraries/parallel.ignore'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.libraries/stm.path'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.libraries/stm.url'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.libraries/stm.ignore'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.utils/haddock.path'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.utils/haddock.url'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.utils/haddock.ignore'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.utils/haddock.branch'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.nofib.path'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.nofib.url'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.nofib.ignore'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.utils/hsc2hs.path'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.utils/hsc2hs.url'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.utils/hsc2hs.ignore'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.libffi-tarballs.path'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.libffi-tarballs.url'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.libffi-tarballs.ignore'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.gmp-tarballs.path'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.gmp-tarballs.url'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule..arc-linters/arcanist-external-json-linter.path'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule..arc-linters/arcanist-external-json-linter.url'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.hadrian.path'. Skipping second one!

warning: d8e2d7e7b072c560d855017e1aaeecc6b3eef9ee:.gitmodules, multiple configurations found for 'submodule.hadrian.url'. Skipping second one!