| That said, is there a way I can push changes in a submodule to a phab | revision? I have no idea! | -----Original Message----- | From: Jan Stolarek [mailto:jan.stolarek@p.lodz.pl] | Sent: 22 December 2014 15:00 | To: ghc-devs@haskell.org | Cc: Simon Peyton Jones | Subject: Re: Fatal: Reference is not a tree | | That's because I updated haddock submodule but that update was not | pushed to Phab. I was able to do a quick build of my patch without | updating haddock so it should only be a problem if you try to | validate. | | That said, is there a way I can push changes in a submodule to a phab | revision? | | Janek | | Dnia poniedziałek, 22 grudnia 2014, Simon Peyton Jones napisał: | > Dear devs | > | > When doing 'arc patch' I got | > | > fatal: reference is not a tree: | > d809f9d656780273f4f79e7a9fb934f783f79702 | > Unable to checkout 'd809f9d656780273f4f79e7a9fb934f783f79702' in | > submodule path 'utils/haddock' | > | > Should I worry? | > | > Simon | > | > | > simonpj@cam-05-unx:~/code/HEAD-2$ arc patch D202 arc patch D202 You | > have untracked files in this working copy. | > | > Working copy: /home/simonpj/code/HEAD-2/ | > | > Untracked files in working copy: | > flat-skol-diff | > foo | > foo2 | > index.html.1 | > index.html.2 | > index.html.3 | > resume | > spj-patch | > spj-patch-save | > testsuite/mk/ghcconfig_home_simonmar_fp_bin_x86_64-unknown- | linux_ghc.mk | > testsuite/tests/simplCore/should_compile/T8538.hs | > testsuite/tests/simplCore/should_compile/T9073.hs | > tmp-patch | > untch-patch | > | > Since you don't have '.gitignore' rules for these files and have not | > listed them in '.git/info/exclude', you may have forgotten to 'git | > add' them to your commit. | > | > | > Do you want to amend these files to the commit? [y/N] n n | > | > Created and checked out branch arcpatch-D202. | > Checking patch compiler/basicTypes/MkId.hs... | > Checking patch compiler/basicTypes/NameEnv.hs... | > Checking patch compiler/basicTypes/VarSet.hs... | > Checking patch compiler/deSugar/DsMeta.hs... | > Checking patch compiler/hsSyn/Convert.hs... | > Checking patch compiler/hsSyn/HsDecls.hs... | > Checking patch compiler/hsSyn/PlaceHolder.hs... | > Checking patch compiler/iface/BuildTyCl.hs... | > Checking patch compiler/iface/IfaceSyn.hs... | > Checking patch compiler/iface/MkIface.hs... | > Checking patch compiler/iface/TcIface.hs... | > Checking patch compiler/main/GHC.hs... | > Checking patch compiler/main/HscTypes.hs... | > Checking patch compiler/parser/ApiAnnotation.hs... | > Checking patch compiler/parser/Parser.y... | > Checking patch compiler/parser/RdrHsSyn.hs... | > Checking patch compiler/prelude/TysPrim.hs... | > Checking patch compiler/rename/RnSource.hs... | > Checking patch compiler/rename/RnTypes.hs... | > Checking patch compiler/typecheck/FamInst.hs... | > Checking patch compiler/typecheck/TcEnv.hs... | > Checking patch compiler/typecheck/TcEvidence.hs... | > Checking patch compiler/typecheck/TcInstDcls.hs... | > Checking patch compiler/typecheck/TcRnDriver.hs... | > Checking patch compiler/typecheck/TcRnMonad.hs... | > Checking patch compiler/typecheck/TcSplice.hs... | > Checking patch compiler/typecheck/TcTyClsDecls.hs... | > Checking patch compiler/typecheck/TcTypeNats.hs... | > Checking patch compiler/typecheck/TcValidity.hs... | > Checking patch compiler/types/CoAxiom.hs... | > Checking patch compiler/types/Coercion.hs... | > Checking patch compiler/types/FamInstEnv.hs... | > Checking patch compiler/types/Kind.hs... | > Checking patch compiler/types/OptCoercion.hs... | > Checking patch compiler/types/TyCon.hs... | > Checking patch compiler/types/TypeRep.hs... | > Checking patch compiler/types/TypeRep.hs-boot... | > Checking patch compiler/utils/Outputable.hs... | > Checking patch compiler/vectorise/Vectorise/Generic/PADict.hs... | > Checking patch compiler/vectorise/Vectorise/Generic/PAMethods.hs... | > Checking patch compiler/vectorise/Vectorise/Type/Env.hs... | > Checking patch compiler/vectorise/Vectorise/Utils/PADict.hs... | > Checking patch libraries/template-haskell/Language/Haskell/TH.hs... | > Checking patch libraries/template- | haskell/Language/Haskell/TH/Lib.hs... | > Checking patch libraries/template- | haskell/Language/Haskell/TH/Ppr.hs... | > Checking patch libraries/template- | haskell/Language/Haskell/TH/PprLib.hs... | > Checking patch libraries/template- | haskell/Language/Haskell/TH/Syntax.hs... | > Checking patch testsuite/tests/ghci/scripts/T6018ghci.script... | > Checking patch testsuite/tests/ghci/scripts/T6018ghci.stdout... | > Checking patch testsuite/tests/ghci/scripts/T6018ghcifail.script... | > Checking patch testsuite/tests/ghci/scripts/T6018ghcifail.stderr... | > Checking patch | testsuite/tests/ghci/scripts/T6018ghcirnfail.script... | > Checking patch | testsuite/tests/ghci/scripts/T6018ghcirnfail.stderr... | > Checking patch testsuite/tests/ghci/scripts/all.T... | > Checking patch testsuite/tests/rename/should_fail/T6018rnfail.hs... | > Checking patch | testsuite/tests/rename/should_fail/T6018rnfail.stderr... | > Checking patch testsuite/tests/rename/should_fail/all.T... | > Checking patch testsuite/tests/typecheck/should_compile/T6018.hs... | > Checking patch testsuite/tests/typecheck/should_compile/T6018.hs- | boot... | > Checking patch | testsuite/tests/typecheck/should_compile/T6018.stderr... | > Checking patch testsuite/tests/typecheck/should_compile/T6018a.hs... | > Checking patch testsuite/tests/typecheck/should_compile/all.T... | > Checking patch | testsuite/tests/typecheck/should_fail/T6018Afail.hs... | > Checking patch | testsuite/tests/typecheck/should_fail/T6018Bfail.hs... | > Checking patch | testsuite/tests/typecheck/should_fail/T6018Cfail.hs... | > Checking patch | testsuite/tests/typecheck/should_fail/T6018Dfail.hs... | > Checking patch testsuite/tests/typecheck/should_fail/T6018fail.hs... | > Checking patch | testsuite/tests/typecheck/should_fail/T6018fail.stderr... | > Checking patch | testsuite/tests/typecheck/should_fail/T6018failclosed1.hs... | > Checking patch | > testsuite/tests/typecheck/should_fail/T6018failclosed1.stderr... | > /tmp/62xml2q9glk44k0o/14486-pNEMxf:4283: new blank line at EOF. | > + | > Checking patch | testsuite/tests/typecheck/should_fail/T6018failclosed2.hs... | > Checking patch | > testsuite/tests/typecheck/should_fail/T6018failclosed2.stderr... | > Checking patch | > testsuite/tests/typecheck/should_fail/T6018failclosed3.hs... | Checking patch | testsuite/tests/typecheck/should_fail/T6018failclosed3.stderr... | > Checking patch | testsuite/tests/typecheck/should_fail/T6018failclosed4.hs... | > Checking patch | > testsuite/tests/typecheck/should_fail/T6018failclosed4.stderr... | > Checking patch | > testsuite/tests/typecheck/should_fail/T6018failclosed5.hs... | Checking patch | testsuite/tests/typecheck/should_fail/T6018failclosed5.stderr... | > /tmp/62xml2q9glk44k0o/14486-pNEMxf:4399: new blank line at EOF. | > + | > Checking patch | testsuite/tests/typecheck/should_fail/T6018failclosed6.hs... | > Checking patch | > testsuite/tests/typecheck/should_fail/T6018failclosed6.stderr... | > Checking patch | > testsuite/tests/typecheck/should_fail/T6018failclosed7.hs... | Checking patch | testsuite/tests/typecheck/should_fail/T6018failclosed7.stderr... | > Checking patch | testsuite/tests/typecheck/should_fail/T6018failclosed8.hs... | > Checking patch | > testsuite/tests/typecheck/should_fail/T6018failclosed8.stderr... | > Checking patch | > testsuite/tests/typecheck/should_fail/T6018failclosed9.hs... | Checking patch | testsuite/tests/typecheck/should_fail/T6018failclosed9.stderr... | > Checking patch testsuite/tests/typecheck/should_fail/all.T... | > Checking patch utils/haddock... | > warning: unable to rmdir utils/haddock: Directory not empty Applied | > patch compiler/basicTypes/MkId.hs cleanly. | > Applied patch compiler/basicTypes/NameEnv.hs cleanly. | > Applied patch compiler/basicTypes/VarSet.hs cleanly. | > Applied patch compiler/deSugar/DsMeta.hs cleanly. | > Applied patch compiler/hsSyn/Convert.hs cleanly. | > Applied patch compiler/hsSyn/HsDecls.hs cleanly. | > Applied patch compiler/hsSyn/PlaceHolder.hs cleanly. | > Applied patch compiler/iface/BuildTyCl.hs cleanly. | > Applied patch compiler/iface/IfaceSyn.hs cleanly. | > Applied patch compiler/iface/MkIface.hs cleanly. | > Applied patch compiler/iface/TcIface.hs cleanly. | > Applied patch compiler/main/GHC.hs cleanly. | > Applied patch compiler/main/HscTypes.hs cleanly. | > Applied patch compiler/parser/ApiAnnotation.hs cleanly. | > Applied patch compiler/parser/Parser.y cleanly. | > Applied patch compiler/parser/RdrHsSyn.hs cleanly. | > Applied patch compiler/prelude/TysPrim.hs cleanly. | > Applied patch compiler/rename/RnSource.hs cleanly. | > Applied patch compiler/rename/RnTypes.hs cleanly. | > Applied patch compiler/typecheck/FamInst.hs cleanly. | > Applied patch compiler/typecheck/TcEnv.hs cleanly. | > Applied patch compiler/typecheck/TcEvidence.hs cleanly. | > Applied patch compiler/typecheck/TcInstDcls.hs cleanly. | > Applied patch compiler/typecheck/TcRnDriver.hs cleanly. | > Applied patch compiler/typecheck/TcRnMonad.hs cleanly. | > Applied patch compiler/typecheck/TcSplice.hs cleanly. | > Applied patch compiler/typecheck/TcTyClsDecls.hs cleanly. | > Applied patch compiler/typecheck/TcTypeNats.hs cleanly. | > Applied patch compiler/typecheck/TcValidity.hs cleanly. | > Applied patch compiler/types/CoAxiom.hs cleanly. | > Applied patch compiler/types/Coercion.hs cleanly. | > Applied patch compiler/types/FamInstEnv.hs cleanly. | > Applied patch compiler/types/Kind.hs cleanly. | > Applied patch compiler/types/OptCoercion.hs cleanly. | > Applied patch compiler/types/TyCon.hs cleanly. | > Applied patch compiler/types/TypeRep.hs cleanly. | > Applied patch compiler/types/TypeRep.hs-boot cleanly. | > Applied patch compiler/utils/Outputable.hs cleanly. | > Applied patch compiler/vectorise/Vectorise/Generic/PADict.hs | cleanly. | > Applied patch compiler/vectorise/Vectorise/Generic/PAMethods.hs | cleanly. | > Applied patch compiler/vectorise/Vectorise/Type/Env.hs cleanly. | > Applied patch compiler/vectorise/Vectorise/Utils/PADict.hs cleanly. | > Applied patch libraries/template-haskell/Language/Haskell/TH.hs | cleanly. | > Applied patch libraries/template-haskell/Language/Haskell/TH/Lib.hs | > cleanly. Applied patch | > libraries/template-haskell/Language/Haskell/TH/Ppr.hs cleanly. | Applied | > patch libraries/template-haskell/Language/Haskell/TH/PprLib.hs | cleanly. | > Applied patch libraries/template- | haskell/Language/Haskell/TH/Syntax.hs | > cleanly. Applied patch testsuite/tests/ghci/scripts/T6018ghci.script | > cleanly. Applied patch testsuite/tests/ghci/scripts/T6018ghci.stdout | > cleanly. Applied patch | > testsuite/tests/ghci/scripts/T6018ghcifail.script | > cleanly. Applied patch | > testsuite/tests/ghci/scripts/T6018ghcifail.stderr | > cleanly. Applied patch | > testsuite/tests/ghci/scripts/T6018ghcirnfail.script | > cleanly. Applied patch | > testsuite/tests/ghci/scripts/T6018ghcirnfail.stderr | > cleanly. Applied patch testsuite/tests/ghci/scripts/all.T cleanly. | > Applied patch testsuite/tests/rename/should_fail/T6018rnfail.hs | cleanly. | > Applied patch testsuite/tests/rename/should_fail/T6018rnfail.stderr | > cleanly. Applied patch testsuite/tests/rename/should_fail/all.T | cleanly. | > Applied patch testsuite/tests/typecheck/should_compile/T6018.hs | cleanly. | > Applied patch testsuite/tests/typecheck/should_compile/T6018.hs-boot | > cleanly. Applied patch | > testsuite/tests/typecheck/should_compile/T6018.stderr cleanly. | Applied | > patch testsuite/tests/typecheck/should_compile/T6018a.hs cleanly. | > Applied patch testsuite/tests/typecheck/should_compile/all.T | cleanly. | > Applied patch testsuite/tests/typecheck/should_fail/T6018Afail.hs | > cleanly. Applied patch | > testsuite/tests/typecheck/should_fail/T6018Bfail.hs cleanly. Applied | > patch testsuite/tests/typecheck/should_fail/T6018Cfail.hs cleanly. | > Applied patch testsuite/tests/typecheck/should_fail/T6018Dfail.hs | > cleanly. Applied patch | > testsuite/tests/typecheck/should_fail/T6018fail.hs cleanly. Applied | patch testsuite/tests/typecheck/should_fail/T6018fail.stderr cleanly. | Applied patch | testsuite/tests/typecheck/should_fail/T6018failclosed1.hs cleanly. | > Applied patch | > testsuite/tests/typecheck/should_fail/T6018failclosed1.stderr | > cleanly. Applied patch | > testsuite/tests/typecheck/should_fail/T6018failclosed2.hs cleanly. | > Applied patch | > testsuite/tests/typecheck/should_fail/T6018failclosed2.stderr | > cleanly. Applied patch | > testsuite/tests/typecheck/should_fail/T6018failclosed3.hs cleanly. | > Applied patch | > testsuite/tests/typecheck/should_fail/T6018failclosed3.stderr | > cleanly. Applied patch | > testsuite/tests/typecheck/should_fail/T6018failclosed4.hs cleanly. | > Applied patch | > testsuite/tests/typecheck/should_fail/T6018failclosed4.stderr | > cleanly. Applied patch | > testsuite/tests/typecheck/should_fail/T6018failclosed5.hs cleanly. | > Applied patch | > testsuite/tests/typecheck/should_fail/T6018failclosed5.stderr | > cleanly. Applied patch | > testsuite/tests/typecheck/should_fail/T6018failclosed6.hs cleanly. | > Applied patch | > testsuite/tests/typecheck/should_fail/T6018failclosed6.stderr | > cleanly. Applied patch | > testsuite/tests/typecheck/should_fail/T6018failclosed7.hs cleanly. | > Applied patch | > testsuite/tests/typecheck/should_fail/T6018failclosed7.stderr | > cleanly. Applied patch | > testsuite/tests/typecheck/should_fail/T6018failclosed8.hs cleanly. | > Applied patch | > testsuite/tests/typecheck/should_fail/T6018failclosed8.stderr | > cleanly. Applied patch | > testsuite/tests/typecheck/should_fail/T6018failclosed9.hs cleanly. | > Applied patch | > testsuite/tests/typecheck/should_fail/T6018failclosed9.stderr | > cleanly. Applied patch testsuite/tests/typecheck/should_fail/all.T | cleanly. | > Applied patch utils/haddock cleanly. | > warning: 2 lines add whitespace errors. | > Submodule 'libffi-tarballs' () registered for path 'libffi-tarballs' | > Submodule 'libraries/Cabal' () registered for path 'libraries/Cabal' | > Submodule 'libraries/Win32' () registered for path 'libraries/Win32' | > Submodule 'libraries/array' () registered for path 'libraries/array' | > Submodule 'libraries/binary' () registered for path | 'libraries/binary' | > Submodule 'libraries/bytestring' () registered for path | > 'libraries/bytestring' Submodule 'libraries/containers' () | registered | > for path 'libraries/containers' Submodule 'libraries/deepseq' () | > registered for path 'libraries/deepseq' Submodule | > 'libraries/directory' () registered for path 'libraries/directory' | > Submodule 'libraries/dph' () registered for path 'libraries/dph' | > Submodule 'libraries/filepath' () registered for path | 'libraries/filepath' | > Submodule 'libraries/haskeline' () registered for path | > 'libraries/haskeline' Submodule 'libraries/hoopl' () registered for | > path 'libraries/hoopl' Submodule 'libraries/hpc' () registered for | > path 'libraries/hpc' | > Submodule 'libraries/parallel' () registered for path | 'libraries/parallel' | > Submodule 'libraries/pretty' () registered for path | 'libraries/pretty' | > Submodule 'libraries/primitive' () registered for path | > 'libraries/primitive' Submodule 'libraries/process' () registered | for | > path 'libraries/process' Submodule 'libraries/random' () registered | > for path 'libraries/random' Submodule 'libraries/stm' () registered | > for path 'libraries/stm' | > Submodule 'libraries/terminfo' () registered for path | 'libraries/terminfo' | > Submodule 'libraries/time' () registered for path 'libraries/time' | > Submodule 'libraries/transformers' () registered for path | > 'libraries/transformers' Submodule 'libraries/unix' () registered | for | > path 'libraries/unix' Submodule 'libraries/vector' () registered for | > path 'libraries/vector' Submodule 'libraries/xhtml' () registered | for | > path 'libraries/xhtml' Submodule 'nofib' () registered for path | 'nofib' | > Submodule 'utils/haddock' () registered for path 'utils/haddock' | > Submodule 'utils/hsc2hs' () registered for path 'utils/hsc2hs' | > Submodule path 'libraries/Cabal': checked out | > '82d2fe1f5083e56f0b2d2c2409a3f673a56a5fe4' Submodule path | > 'libraries/containers': checked out | > 'ddf4e4a7abbfb81161251437a6a5bbe8167a7cde' Submodule path | > 'libraries/directory': checked out | > 'bcb8c40b5e0a17030bcc085b46bf8718ea713107' Submodule path | > 'libraries/hoopl': checked out | 'a90a3af92be400af8912555bce21b041a1c48ad4' | > Submodule path 'libraries/pretty': checked out | > '110b105c491387a73dd37b4f86a686ed131767b2' Submodule path | > 'libraries/random': checked out | '180aa65507d5b7c63d9f438ff908774bafc88d0d' | > fatal: reference is not a tree: | > d809f9d656780273f4f79e7a9fb934f783f79702 | > Unable to checkout 'd809f9d656780273f4f79e7a9fb934f783f79702' in | > submodule path 'utils/haddock' OKAY Successfully committed patch. | > simonpj@cam-05-unx:~/code/HEAD-2$ git fetch git fetch | > simonpj@cam-05-unx:~/code/HEAD-2$ git submodule update git submodule | > update simonpj@cam-05-unx:~/code/HEAD-2$ git status git status # On | > branch arcpatch-D202 # Untracked files: | > # (use "git add <file>..." to include in what will be committed) | > # | > # flat-skol-diff | > # foo | > # foo2 | > # index.html.1 | > # index.html.2 | > # index.html.3 | > # resume | > # spj-patch | > # spj-patch-save | > # | > testsuite/mk/ghcconfig_home_simonmar_fp_bin_x86_64-unknown- | linux_ghc.mk # | > testsuite/tests/simplCore/should_compile/T8538.hs | > # testsuite/tests/simplCore/should_compile/T9073.hs | > # tmp-patch | > # untch-patch | > nothing added to commit but untracked files present (use "git add" | to | > track) simonpj@cam-05-unx:~/code/HEAD-2$ |