public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster-e+AXbWqSrlAAvxtiuMwx3w@public•gmane.org>
To: Jeff King <peff-AdEPDUrAXsQ@public•gmane.org>
Cc: Joe Perches <joe-6d6DIl74uiNBDgjK7y7TUQ@public•gmane.org>,
	Greg Kroah-Hartman
	<gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public•gmane.org>,
	Michal Sojka <sojka-Knnw/vAvyUalVyrhU4qvOw@public•gmane.org>,
	linux-usb-u79uwXL29TY76Z2rM5mHXA@public•gmane.org,
	Alan Stern
	<stern-nwvwT67g6+6dFdvTe/nMLpVzexx5G7lz@public•gmane.org>,
	Bryan Wu <cooloney-Re5JQEeQqe8AvxtiuMwx3w@public•gmane.org>,
	Felipe Balbi <balbi-l0cyMroinI0@public•gmane.org>,
	Linux LED Subsystem
	<linux-leds-u79uwXL29TY76Z2rM5mHXA@public•gmane.org>,
	linux-kernel-u79uwXL29TY76Z2rM5mHXA@public•gmane.org,
	michal.vokac-veUE7cmDK2A@public•gmane.org,
	git <git-u79uwXL29TY76Z2rM5mHXA@public•gmane.org>
Subject: Re: project wide: git config entry for [diff] renames=true
Date: Thu, 25 Sep 2014 11:53:38 -0700	[thread overview]
Message-ID: <xmqqy4t7a5vx.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <20140925180005.GA11755-AdEPDUrAXsQ@public.gmane.org> (Jeff King's message of "Thu, 25 Sep 2014 14:00:05 -0400")

Jeff King <peff-AdEPDUrAXsQ@public•gmane.org> writes:

> There is no such mechanism within git. We've resisted adding one because
> of the danger of something like:
>
>   [diff]
>     external = rm -rf /
>
> diff.renames is probably safe, but any config-sharing mechanism would
> have to deal with either whitelisting, or providing some mechanism for
> the puller to review changes before blindly following them.

It might be useful to add a "safe include" feature, perhaps?  We
ship a small set of hardcoded default whitelist (diff.renames may be
included in there), and allow the user who do not want to be
affected to override it with

    [include]
        safe = !diff.renames

or even

    [config]
    	safe = !*

at the same time allow them to add what we do not hardcode to it
using the same mechanism, e.g.

    [config]
    	safe = merge.*

Then

    [include]
	safe
    	path = ../project.gitconfig

    [include]
    	path = $HOME/.gitconfig-variant1

would only allow the variables include.safe deems safe to affect
us from the in-tree file, and use everything from my personal set in
my home directory.



    	
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public•gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

  parent reply	other threads:[~2014-09-25 18:53 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <Pine.LNX.4.44L0.1409241106100.1580-100000@iolanthe.rowland.org>
     [not found] ` <1411591401-5874-1-git-send-email-sojka@merica.cz>
     [not found]   ` <1411591401-5874-4-git-send-email-sojka@merica.cz>
     [not found]     ` <20140925150353.GA15325@kroah.com>
2014-09-25 15:48       ` project wide: git config entry for [diff] renames=true Joe Perches
2014-09-25 18:00         ` Jeff King
2014-09-25 18:06           ` Joe Perches
2014-09-25 18:43             ` Junio C Hamano
     [not found]           ` <20140925180005.GA11755-AdEPDUrAXsQ@public.gmane.org>
2014-09-25 18:53             ` Junio C Hamano [this message]
2014-09-25 18:55               ` Junio C Hamano
2014-10-03  1:37               ` [RFC/PATCH 0/2] Introduce safe-include config feature Rasmus Villemoes
2014-10-03  1:37                 ` [RFC/PATCH 1/2] config: Add safe-include directive Rasmus Villemoes
2014-10-03  5:27                   ` Junio C Hamano
2014-10-03  5:34                     ` Junio C Hamano
2014-10-03 18:52                     ` Junio C Hamano
2014-10-06  9:28                     ` Rasmus Villemoes
2014-10-06 17:58                       ` Junio C Hamano
2014-10-03  1:37                 ` [RFC/PATCH 2/2] config: Add test of safe-include feature Rasmus Villemoes

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqy4t7a5vx.fsf@gitster.dls.corp.google.com \
    --to=gitster-e+axbwqsrlaavxtiumwx3w@public$(echo .)gmane.org \
    --cc=balbi-l0cyMroinI0@public$(echo .)gmane.org \
    --cc=cooloney-Re5JQEeQqe8AvxtiuMwx3w@public$(echo .)gmane.org \
    --cc=git-u79uwXL29TY76Z2rM5mHXA@public$(echo .)gmane.org \
    --cc=gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public$(echo .)gmane.org \
    --cc=joe-6d6DIl74uiNBDgjK7y7TUQ@public$(echo .)gmane.org \
    --cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public$(echo .)gmane.org \
    --cc=linux-leds-u79uwXL29TY76Z2rM5mHXA@public$(echo .)gmane.org \
    --cc=linux-usb-u79uwXL29TY76Z2rM5mHXA@public$(echo .)gmane.org \
    --cc=michal.vokac-veUE7cmDK2A@public$(echo .)gmane.org \
    --cc=peff-AdEPDUrAXsQ@public$(echo .)gmane.org \
    --cc=sojka-Knnw/vAvyUalVyrhU4qvOw@public$(echo .)gmane.org \
    --cc=stern-nwvwT67g6+6dFdvTe/nMLpVzexx5G7lz@public$(echo .)gmane.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox