On Fri, Jan 29, 2016 at 12:21 AM, Alexander Rojas <[email protected]> wrote:
> It certainly is not unwittingly unless you are one of those who do `git > yolo` and we should really discourage such dangerous way of writing patches. The "unwittingly" was referred to modifying a file that is *actually* under source control, without actually wanting to do so. .gitignore is not under source control - it is, in fact, "gitignored" (I think it's the first line?) and, yet, "editing" it (note the quotes) causes one's changes to appear in the patch. Once you do git status you will notice there is something wrong with the > template. > > yup - I think the current term for such a situation is a "WAT" :) > That being said, +1 to add this to the documentation. These caveats should > be mentioned for newcomers. > Fully agree, thanks. > > > On 28 Jan 2016, at 17:06, Marco Massenzio <[email protected]> wrote: > > > > On Thu, Jan 28, 2016 at 3:18 AM, Michael Park <[email protected]> wrote: > > > >> This has been done here: > >> > https://github.com/apache/mesos/commit/16c62e5965f304ba59f26f4dbe0bcdfaded7c5ae > >> > > > > Unless I'm missing something fundamental here, this means that anyone > who > > decides to add some pattern to the <root>/.gitignore file (assuming they > > don't realize it's a symlink and just go `vim .gitignore`) will add those > > changes > > (unwittingly) to `support/gitignore` - changes that will end up in the > > patch. > > > > I would recommend we add appropriate documentation in the "getting > started" > > or "contributing to mesos" guides, as this may catch folks new to the > > project off-guard. > > > > > > > >> > >> > >> On 20 January 2016 at 21:02, Marco Massenzio <[email protected]> > >> wrote: > >> > >>> +1 for consistency > >>> > >>> Just a quick note to point out that if you _symlink_ .gitignore, then > any > >>> changes folks make to that file (to customize to their needs, eg, > ignore > >>> IDE-specific files etc.) would unwittingly become diffs to > >>> .gitignore_template. > >>> > >>> A possible alternative may be to _copy_ .gitignore_template to > .gitignore, > >>> so that local changes stay that way (as we already ignore .gitignore). > >>> The obvious downside is that changes to the _template do not get > reflected > >>> to the .gitignore copy; but those are rare enough that we can easily > >>> address them by dropping an email to this list, perhaps? > >>> > >>> (and, yes, using a global ~/.gitignore is a great strategy, but there > may > >>> be cases in which it may not be possible/desirable) > >>> > >>> I'm easy either way and don't mind whichever we choose; just pointing > out > >>> a > >>> possible issue. > >>> > >>> -- > >>> *Marco Massenzio* > >>> > >>> http://codetrips.com > >>> > >>> On Wed, Jan 20, 2016 at 8:20 PM, Avinash Sridharan < > [email protected] > >>>> > >>> wrote: > >>> > >>>> +1 MPark > >>>> > >>>> Thanks Kevin for the tip. Found it useful !! > >>>> > >>>> On Wed, Jan 20, 2016 at 3:48 PM, Kevin Klues <[email protected]> > wrote: > >>>> > >>>>> +1 for Consistency! > >>>>> > >>>>> As a side note, I add custom .gitignore stuff in a global .gitignore > >>>>> file I install at ~/.gitignore. This is useful for ignoring things > >>>>> specific to editor temporary files (e.g. *.swo in vim), etc. > >>>>> > >>>>> you can make git aware of it via: > >>>>> $ git config --global core.excludesfile ~/.gitignore > >>>>> > >>>>> On Wed, Jan 20, 2016 at 3:45 PM, Michael Park <[email protected]> > >>> wrote: > >>>>>> We have a few other default templates such as `support/clang-format` > >>>> and > >>>>>> `support/reviewboardrc`, and `bootstrap` symlinks them to > >>>> `.clang-format` > >>>>>> and `.reviewboardrc` respectively. > >>>>>> > >>>>>> To keep this pattern consistent, I would like to move the > >>>>>> `.gitignore-template` template to `support/gitignore` and have > >>>>> `bootstrap` > >>>>>> symlink it to `.gitignore`. > >>>>>> > >>>>>> Please let me know if you're opposed to this change. > >>>>>> > >>>>>> Thanks! > >>>>>> > >>>>>> MPark. > >>>>> > >>>>> > >>>>> > >>>>> -- > >>>>> ~Kevin > >>>>> > >>>> > >>>> > >>>> > >>>> -- > >>>> Avinash Sridharan, Mesosphere > >>>> +1 (323) 702 5245 > >>>> > >>> > >> > >> > >
