git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [STGIT PATCH] replace "git repo-config" usage by "git config"

From
CMCatalin Marinas <catalin.marinas@gmail.com>
Date
Jan 24, 2008, 15:31 UTC
Message-ID
<b0943d9e0801240731q856925al267d81548f5e2091@mail.gmail.com>
In-Reply-To
<20080124070125.GA19653@diana.vm.bytemark.co.uk>
On 24/01/2008, Karl Hasselström <kha@treskal.com> wrote:
Show 13 quoted lines
> 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
Previous: Karl HasselströmNext: Karl Hasselström
Message 19 of 21 in “Remove repo-config”
  1. Remove repo-configDan McGee, Jan 16, 2008
  2. Junio C HamanoJan 16, 2008
  3. Dan McGeeJan 16, 2008
  4. Junio C HamanoJan 16, 2008
  5. Junio C HamanoJan 16, 2008
  6. Junio C HamanoJan 16, 2008
  7. Peter OberndorferJan 16, 2008
  8. replace "git repo-config" usage by "git config"Peter Oberndorfer, Jan 16, 2008
  9. Jakub NarebskiJan 16, 2008
  10. Peter OberndorferJan 16, 2008
  11. Catalin MarinasJan 17, 2008
  12. Jakub NarebskiJan 17, 2008
  13. Karl HasselströmJan 17, 2008
  14. Karl HasselströmJan 18, 2008
  15. Catalin MarinasJan 23, 2008
  16. Karl HasselströmJan 23, 2008
  17. Catalin MarinasJan 23, 2008
  18. Karl HasselströmJan 24, 2008
  19. Catalin MarinasJan 24, 2008
  20. Karl HasselströmJan 24, 2008
  21. Catalin MarinasJan 24, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.