From mboxrd@z Thu Jan 1 00:00:00 1970 From: john at keeping.me.uk (John Keeping) Date: Thu, 9 Jan 2014 20:10:35 +0000 Subject: [PATCH 2/2] README: Update dependencies In-Reply-To: <20140109192624.708.49862@typhoon.lan> References: <1389206730-15629-1-git-send-email-cgit@cryptocrack.de> <1389206730-15629-2-git-send-email-cgit@cryptocrack.de> <20140109073046.17499.17677@typhoon.lan> <20140109180141.GI7608@serenity.lan> <20140109192624.708.49862@typhoon.lan> Message-ID: <20140109201035.GL7608@serenity.lan> On Thu, Jan 09, 2014 at 08:26:24PM +0100, Lukas Fleischer wrote: > On Thu, 09 Jan 2014 at 19:01:42, John Keeping wrote: > > On Thu, Jan 09, 2014 at 04:13:08PM +0100, Jason A. Donenfeld wrote: > > > On Thu, Jan 9, 2014 at 8:30 AM, Lukas Fleischer wrote: > > > > We depend on Git in the test suite. Maybe this should be changed to use > > > > the binary from the Git submodule instead? > > > > > > I think we discussed the possibility of this a while ago with John. > > > This would make most sense to me, though we are using git's test > > > harness, and I'd like to avoid making invasive changes in that, if > > > possible. > > > > We do already build the Git tools when building the test target (as > > opposed to just libgit.a when building the cgit binary), but I can't > > remember why we do this... > > > > It's probably simplest just to further tweak $PATH in tests/setup.sh so > > it also prepends "$(pwd)/../../git/bin-wrappers". That should cause us > > to use the Git tools from the submodule without needing to do anything > > else. > > That sounds like a good idea to me. Do you want to prepare a patch? Now that I've dug into this some more, it turns out that we're already using the Git tools from the submodule! The Git test framework already sets up the path to use the tools from the Git tree, which explains why the Makefile makes sure we build the Git CLI utilities.