From: "Catalin Marinas" <catalin.marinas@gmail.com>
To: "Karl Hasselström" <kha@treskal.com>
Cc: "Peter Oberndorfer" <kumbayo84@arcor.de>,
git@vger.kernel.org, "Pavel Roskin" <proski@gnu.org>
Subject: Re: [STGIT PATCH] replace "git repo-config" usage by "git config"
Date: Thu, 24 Jan 2008 15:31:40 +0000 [thread overview]
Message-ID: <b0943d9e0801240731q856925al267d81548f5e2091@mail.gmail.com> (raw)
In-Reply-To: <20080124070125.GA19653@diana.vm.bytemark.co.uk>
On 24/01/2008, Karl Hasselström <kha@treskal.com> 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
next prev parent reply other threads:[~2008-01-24 15:32 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-01-16 3:19 [RFC/PATCH] Remove repo-config Dan McGee
2008-01-16 4:23 ` Junio C Hamano
2008-01-16 4:40 ` Dan McGee
2008-01-16 17:20 ` Junio C Hamano
2008-01-16 20:32 ` Junio C Hamano
2008-01-16 20:13 ` Junio C Hamano
2008-01-16 20:47 ` Peter Oberndorfer
2008-01-16 20:58 ` [STGIT PATCH] replace "git repo-config" usage by "git config" Peter Oberndorfer
2008-01-16 21:13 ` Jakub Narebski
2008-01-16 21:46 ` Peter Oberndorfer
2008-01-17 17:07 ` Catalin Marinas
2008-01-17 23:49 ` Jakub Narebski
2008-01-17 7:45 ` Karl Hasselström
2008-01-18 4:24 ` Karl Hasselström
2008-01-23 11:35 ` Catalin Marinas
2008-01-23 16:10 ` Karl Hasselström
2008-01-23 16:42 ` Catalin Marinas
2008-01-24 7:01 ` Karl Hasselström
2008-01-24 15:31 ` Catalin Marinas [this message]
2008-01-24 18:08 ` Karl Hasselström
2008-01-24 18:20 ` Catalin Marinas
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=b0943d9e0801240731q856925al267d81548f5e2091@mail.gmail.com \
--to=catalin.marinas@gmail.com \
--cc=git@vger.kernel.org \
--cc=kha@treskal.com \
--cc=kumbayo84@arcor.de \
--cc=proski@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).