From: Catalin Marinas Date: Thu, 24 Jan 2008 15:31:40 GMT Subject: Re: [STGIT PATCH] replace "git repo-config" usage by "git config" Message-ID: In-Reply-To: <20080124070125.GA19653@diana.vm.bytemark.co.uk> On 24/01/2008, Karl Hasselström wrote: > On 2008-01-23 16:42:41 +0000, Catalin Marinas wrote: > > $ stg goto realview-eb-header > > Popped realview-pb1176 -- realview-ioaddress > > fatal: Entry 'arch/arm/mach-realview/realview_pb11mp.c' not uptodate. > > Cannot merge. > > stg goto: Command aborted (all changes rolled back) > > > > It worked fine after running 'stg status' once (and not showing any > > changes). In the old GIT interface, we use to call refresh_index (i.e. > > 'git update-index -q --unmerged --refresh'). Does this still happen? > > Ah, no, I guess it doesn't. And I guess it should. We should probably > have a test for that ... Yes. Another thing, can the '--keep' option be added? Can it work with the new structure? I use it quite often as I make some minor modification and I'd like to pop patches without affecting the local changes. > And there should probably be an explicit "Checking out files ... done" > stage when we run git-read-tree, since that tends to take relatively > much time. Yes, that would be useful as well. -- Catalin