Maybe add this useful lore to Git guidance or Phabricator guidance? S | -----Original Message----- | From: ghc-devs [mailto:ghc-devs-bounces@haskell.org] On Behalf Of Simon | Marlow | Sent: 22 July 2014 12:18 | To: Edward Z. Yang; Richard Eisenberg | Cc: ghc-devs@haskell.org | Subject: Re: a little phrustrated | | On 16/07/14 20:02, Edward Z. Yang wrote: | > Hello Richard, | > | >> 1) I had some untracked files in a submodule repo. I couldn't find a | way to get `arc diff` to ignore these, as they appeared to git to be a | change in a tracked file (that is, a change to a submodule, which is | considered tracked). `git stash` offered no help, so I had to delete | the untracked files. This didn't cause real pain (the files were there | in error), but it seems a weakness of the system if I can't make | progress otherwise. | > | > Yes, this was fairly painful for me as well. One way to make the | pain | > go away and help others out is improve the .gitignore files so these | > files are not considered tracked. Here is another thread discussing | > this problem: | > | > http://comments.gmane.org/gmane.comp.version-control.git/238173 | > | > though I haven't read through it fully yet. | | If you go into your .git/config file in the GHC repo, and add "ignore = | untracked", like this: | | [submodule "nofib"] | url = /home/simon/ghc-mirror/nofib.git | ignore = untracked | | Then git won't consider untracked files in that submodule as making | that submodule dirty, and you'll be able to happily "arc diff". | | Cheers, | Simon | | _______________________________________________ | ghc-devs mailing list | ghc-devs@haskell.org | http://www.haskell.org/mailman/listinfo/ghc-devs