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

Re: use of temporary refs in resolve

From
CMCatalin Marinas <catalin.marinas@gmail.com>
Date
Aug 9, 2005, 09:07 UTC
Message-ID
<tnxmznr32cy.fsf@arm.com>
In-Reply-To
<7v1x53zuyv.fsf@assigned-by-dhcp.cox.net>
Junio C Hamano <junkio@cox.net> wrote:
Show 5 quoted lines
> If you are happy then I should not complain ;-), and I am
> certainly not complaining, but I still have this feeling that I
> do not get what you are getting at.  You can change it to
> directly use pull without intermediate fetch, in order to cope
> with what?
I shouldn't have said anything :-).

StGIT implements a pull command which pops all the patches from the stack, pulls the latest remote changes and pushes the patches back. I was lazy and I implemented the pulling stage by simply calling git-fetch-script and advancing the base of the stack to the value in FETCH_HEAD. I didn't have any special reason for this and I could have used git-pull-script instead and not rely on the presence of FETCH_HEAD. I don't have any preference here.

> Could you explain how you currently do things, and
> what changes I will be making would break the way you currently
> do things please?

If you plan to implement multiple values in FETCH_HEAD, StGIT won't be able to use this since it doesn't do any merging for the base of the stack. As I said above, this is not a problem and I was probably wrong when decided to use git-fetch-script directly and not git-pull-script.

Please let me know if you need more info.
-- 
Catalin
Previous: Junio C HamanoNext: Junio C Hamano
Message 9 of 10 in “use of temporary refs in resolve”
  1. Junio C HamanoAug 7, 2005
  2. Linus TorvaldsAug 7, 2005
  3. Junio C HamanoAug 7, 2005
  4. Linus TorvaldsAug 7, 2005
  5. Catalin MarinasAug 8, 2005
  6. Junio C HamanoAug 8, 2005
  7. Catalin MarinasAug 8, 2005
  8. Junio C HamanoAug 9, 2005
  9. Catalin MarinasAug 9, 2005
  10. Junio C HamanoAug 9, 2005

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.