Message-ID: <55192081.70900@...1114...> Date: Mon, 30 Mar 2015 12:08:01 +0200 From: David Sommerseth MIME-Version: 1.0 References: <20150225160718.GA6306@...2009...> <20150227182832.GE8134@...1296...> <20150227192746.GA5936@...2009...> <20150227193452.GF8134@...1296...> In-Reply-To: <20150227193452.GF8134@...1296...> Subject: Re: [Openvpn-devel] [PATCH v4] Mac OS X Keychain management client Reply-To: openvpn-devel@lists.sourceforge.net List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit To: Gert Doering , Vasily Kulikov Cc: openvpn-devel@lists.sourceforge.net -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 27/02/15 20:34, Gert Doering wrote: > Hi, > > On Fri, Feb 27, 2015 at 10:27:46PM +0300, Vasily Kulikov wrote: [...snip...] >> I've included .gitignore changes as my patch adds Makefile >> changes. It would be rather uncomfortable for openvpn developers >> to see Makefile and be not able to change it. > > Mmmh. Actually we don't usually do Makefile changes, as this is > always generated by configure for us - so normally, it is good to > have it in .gitignore. Of course your subdirectory has a Makefile > in it for MacOS X only... > > So - git experts to the rescue - how's this normally done? I agree with Arne, do 'git add -f contrib/keychain-mcd/Makefile' instead. And git will keep track of this file, regardless of .gitignore. I don't recall now if -f was always required or just recent versions needs it. I've double checked the .gitignore behaviour on git 1.8.3.1, which required the -f argument. And everything works as expected in this version. - -- kind regards, David Sommerseth -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iEYEARECAAYFAlUZIIEACgkQDC186MBRfrrZOQCgoTh3PmYViPxP4NAl2aqQMDBJ tqoAn3vtnvwhN6qX1/bPhDjxjKTPdbgR =qJIy -----END PGP SIGNATURE-----